From 61381699334cea9a74060b09a2828e05a967fc1e Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Thu, 22 Mar 2018 10:57:38 -0500 Subject: [PATCH] .gitattributes: merge=union for all-packages.nix also module-list.nix --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) 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