summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: 9556c6763e0710baf0ad84330b83bc27d8f2163f (plain)
1
doc/changelog.asciidoc merge=union