summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: c9034f752adbfe7d9ccfeaef60a51125bc203c60 (plain)
1
2
ChangeLog    merge=merge-changelog
ChangeLog-2013    merge=merge-changelog