diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-03-27 11:03:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27 11:03:03 -0500 |
| commit | bc7df1734f88dfe7e55f56f52d593ff129ec2282 (patch) | |
| tree | 23f9bb330eb5d043012a9386f4cde6dcdcee583c /.gitattributes | |
| parent | cd7047c46169b935719ed5f19f693d97bd760ec7 (diff) | |
| download | nixpkgs-bc7df1734f88dfe7e55f56f52d593ff129ec2282.tar nixpkgs-bc7df1734f88dfe7e55f56f52d593ff129ec2282.tar.gz nixpkgs-bc7df1734f88dfe7e55f56f52d593ff129ec2282.tar.bz2 nixpkgs-bc7df1734f88dfe7e55f56f52d593ff129ec2282.tar.lz nixpkgs-bc7df1734f88dfe7e55f56f52d593ff129ec2282.tar.xz nixpkgs-bc7df1734f88dfe7e55f56f52d593ff129ec2282.tar.zst nixpkgs-bc7df1734f88dfe7e55f56f52d593ff129ec2282.zip | |
gitattributes: disable merge=union in all-packages
This would lead to some merge issues occasionally.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 14bee08e381..4862e0eab93 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 |