summaryrefslogtreecommitdiffstats
path: root/.gitattributes
AgeCommit message (Expand)Author
2018-03-27gitattributes: disable merge=union in all-packagesMatthew Justin Bauer
2018-03-22.gitattributes: merge=union for all-packages.nixMatthew Justin Bauer
2018-02-23Add .gitattributes fileMatthew Bauer