git-annex/.gitattributes

4 lines
106 B
Text
Raw Normal View History

2011-01-09 15:12:52 -04:00
debian/changelog merge=dpkg-mergechangelogs
2011-03-19 18:56:36 -04:00
.git-annex/*.log merge=union
.git-annex/*/*/*.log merge=union