summaryrefslogtreecommitdiff
path: root/.gitattributes
AgeCommit message (Expand)Author
2015-08-10Use "union" merge strategy for CHANGELOGBruno Oliveira