summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: 0c4d2c9b20b6385989d53bf6075527ff38cd9889 (plain)
1
CHANGELOG.asciidoc  merge=union