summaryrefslogtreecommitdiff
path: root/.gitattributes
AgeCommit message (Expand)Author
2017-09-04use better merge algorithm for CHANGELOG.mdJörg Thalheim