3 Commits (b81c83c52f8fd4f9db62f78fedb6ffde0e2e6b01)

Author	SHA1	Message	Date
Matthew Justin Bauer	bc7df1734f	gitattributes: disable merge=union in all-packages ... This would lead to some merge issues occasionally.	6 years ago
Matthew Justin Bauer	6138169933	.gitattributes: merge=union for all-packages.nix ... also module-list.nix	6 years ago
Matthew Bauer	af1f5676c9	Add .gitattributes file ... This adds the .gitattributes file to the tree. I’ve added two attributes: linguist-generated, and linguist-documentation. GitHub’s Linguist will follow this when calculating our language stats as well as in other cases like commit diffs. Any additional attributes or other generated files are welcome to be added!	6 years ago