git-annex setup
This commit is contained in:
parent
6a2a17658c
commit
91d1d935dd
1 changed files with 2 additions and 0 deletions
2
.gitattributes
vendored
2
.gitattributes
vendored
|
@ -1 +1,3 @@
|
|||
debian/changelog merge=dpkg-mergechangelogs
|
||||
.git-annex/*.log merge=union
|
||||
.git-annex/*/*/*.log merge=union
|
||||
|
|
Loading…
Add table
Reference in a new issue