summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Collapse)AuthorAge
* Make it easier to deal with changelog conflictsBozhidar Batsov2016-10-20
See https://medium.com/@nettsundere/on-reducing-changelog-merge-conflicts-1eb23552630b#.dcl1qlj7d for details.