Merge pull request #140 from hussainnaqvee/patch-1
[awesomized/libmemcached] / .gitattributes
1 /ChangeLog* merge=touch
2 /docs/sources/ChangeLog* merge=touch
3 /docs/sources/issues.rst merge=touch