git-annex setup

This commit is contained in:
Joey Hess 2011-03-19 18:56:36 -04:00
parent 6a2a17658c
commit 91d1d935dd

2
.gitattributes vendored
View file

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