summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: 437485e51371799320d6112c89c0b45f28c677de (plain)
1
2
CHANGELOG merge=union