3 lines
106 B
Text
3 lines
106 B
Text
debian/changelog merge=dpkg-mergechangelogs
|
|
.git-annex/*.log merge=union
|
|
.git-annex/*/*/*.log merge=union
|