ehmry
/
nixpkgs
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

gitattributes: disable merge=union in all-packages 

This would lead to some merge issues occasionally.
nixos-19.03
Matthew Justin Bauer 4 years ago
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
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .gitattributes

2
.gitattributes
View File

@ -13,4 +13,4 @@ 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
# pkgs/top-level/all-packages.nix merge=union

Write Preview
Loading…
Cancel
Save