public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitattributes: disable merge=union in all-packages 

This would lead to some merge issues occasionally.
This commit is contained in:
Matthew Justin Bauer 2018-03-27 11:03:03 -05:00 committed by GitHub
parent cd7047c461
commit bc7df1734f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

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