enable dpkg-mergechangelogs
This commit is contained in:
parent
fd3efc086a
commit
9de1192c57
1 changed files with 1 additions and 1 deletions
2
.gitattributes
vendored
2
.gitattributes
vendored
|
@ -1 +1 @@
|
|||
.git-annex/*.log merge=union
|
||||
debian/changelog merge=dpkg-mergechangelogs
|
||||
|
|
Loading…
Reference in a new issue