summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Expand)AuthorAgeFilesLines
* - remove .gitattributes and merge=union as this isn't reallyMike Bayer2017-05-221-1/+0
* - experiment with union merge for changelogMike Bayer2016-11-141-0/+1