dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

.gitattributes: merge=union for all-packages.nix

Browse Source 
also module-list.nix
This commit is contained in:
Matthew Justin Bauer 2018-03-22 10:57:38 -05:00 committed by GitHub
parent 64d3fb2fbf
commit 6138169933
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitattributes vendored
View File

@ -11,3 +11,6 @@ doc/default.nix linguist-documentation=false
nixos/doc/** linguist-documentation
nixos/doc/default.nix linguist-documentation=false
nixos/modules/module-list.nix merge=union
pkgs/top-level/all-packages.nix merge=union