summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: b98b07d7d20909ab10ee16532bc32d2403811996 (plain)
1
.git-annex/*.log merge=union