summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: 242d3da0d74bbdee4bc4fd4ca0ca5794d9c138df (plain)
1
CHANGELOG    merge=union