about summary refs log tree commit diff
path: root/.gitattributes
AgeCommit message (Expand)AuthorFilesLines
2018-03-27gitattributes: disable merge=union in all-packagesMatthew Justin Bauer1-1/+1
2018-03-22.gitattributes: merge=union for all-packages.nixMatthew Justin Bauer1-0/+3
2018-02-23Add .gitattributes fileMatthew Bauer1-0/+13