X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=.gitattributes;fp=.gitattributes;h=274345ed85a838c78eefdf02505791ea04b4b5ec;hb=a29ba11e1c6f8ff34f5c6e42e6f7df93b5a87e0d;hp=0000000000000000000000000000000000000000;hpb=4b22e28cd3cf2713b3345940eb709789137cbcf7;p=awesomized%2Flibmemcached

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