diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-03-22 10:57:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-22 10:57:38 -0500 |
| commit | 61381699334cea9a74060b09a2828e05a967fc1e (patch) | |
| tree | 19de24cd209d84cc831f9c4fbcf3ec874314eac5 /.gitattributes | |
| parent | 64d3fb2fbfda0c9fa16a5af88ab5ca1751da3b26 (diff) | |
| download | nixpkgs-61381699334cea9a74060b09a2828e05a967fc1e.tar nixpkgs-61381699334cea9a74060b09a2828e05a967fc1e.tar.gz nixpkgs-61381699334cea9a74060b09a2828e05a967fc1e.tar.bz2 nixpkgs-61381699334cea9a74060b09a2828e05a967fc1e.tar.lz nixpkgs-61381699334cea9a74060b09a2828e05a967fc1e.tar.xz nixpkgs-61381699334cea9a74060b09a2828e05a967fc1e.tar.zst nixpkgs-61381699334cea9a74060b09a2828e05a967fc1e.zip | |
.gitattributes: merge=union for all-packages.nix
also module-list.nix
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index a636295ebd6..14bee08e381 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 |