summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Expand)AuthorAge
* Make it easier to deal with changelog conflictsBozhidar Batsov2016-10-20