Commit Graph

3 Commits (44bc01e1ab37af487ea18032e7683a1f5f7752fc)

Author SHA1 Message Date
Matthew Justin Bauer bc7df1734f
gitattributes: disable merge=union in all-packages 6 years ago
Matthew Justin Bauer 6138169933
.gitattributes: merge=union for all-packages.nix 6 years ago
Matthew Bauer af1f5676c9 Add .gitattributes file 6 years ago