aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
AgeCommit message (Expand)Author
2018-12-29Add merge=union for CONTRIBUTORS.mdJoshua Boniface