summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Collapse)AuthorAgeFilesLines
* Use gitattribute merge=union to reduce CHANGELOG merge conflicts.Douwe Maan2015-02-121-0/+1