summary refs log tree commit diff
path: root/.gitattributes
Commit message (Expand)AuthorAge
* gitattributes: disable merge=union in all-packagesMatthew Justin Bauer2018-03-27
* .gitattributes: merge=union for all-packages.nixMatthew Justin Bauer2018-03-22
* Add .gitattributes fileMatthew Bauer2018-02-23