mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-22 14:45:27 +00:00
.gitattributes: merge=union for all-packages.nix
also module-list.nix
This commit is contained in:
parent
64d3fb2fbf
commit
6138169933
3
.gitattributes
vendored
3
.gitattributes
vendored
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue