touch merge change logs

[awesomized/libmemcached] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..274345e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+/ChangeLog*                                            merge=touch
+/docs/sources/ChangeLog*               merge=touch
+/docs/sources/issues.rst               merge=touch