aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
blob: b83edcae097a39513b2aef46b94b886e044ba28f (plain)
1
2
3
debian/changelog merge=dpkg-mergechangelogs
.git-annex/*.log merge=union
.git-annex/*/*/*.log merge=union