summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: 31f962f663c784190d5d4cfe0be2590692e43051 (plain)
1
ChangeLog       merge=merge-changelog