summaryrefslogtreecommitdiffstats
path: root/.gitattributes
blob: ca4ea2772a39ad70788d4c455b87d9dbd23996d1 (plain)
1
ChangeLog	merge=merge-changelog