This commit is contained in:
Joey Hess 2011-06-22 18:56:08 -04:00
parent ad3770e0b2
commit 1285763015

2
.gitattributes vendored
View file

@ -1,3 +1 @@
debian/changelog merge=dpkg-mergechangelogs
.git-annex/*.log merge=union
.git-annex/*/*/*.log merge=union