diff options
Diffstat (limited to 'modules/user/aszlig/profiles/workstation/default.nix')
-rw-r--r-- | modules/user/aszlig/profiles/workstation/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix index 3914ab2d..383d30e4 100644 --- a/modules/user/aszlig/profiles/workstation/default.nix +++ b/modules/user/aszlig/profiles/workstation/default.nix @@ -80,7 +80,6 @@ in { vuizvui.user.aszlig.programs.git.enable = true; vuizvui.user.aszlig.programs.git.settings = { color.ui = "auto"; - merge.tool = "vimdiff3"; user.email = "aszlig@nix.build"; user.name = "aszlig"; user.signingkey = "DD526BC7767DBA2816C095E5684089CE67EBB691"; @@ -93,6 +92,9 @@ in { commit.gpgsign = true; pull.rebase = false; + merge.tool = "vimdiff3"; + merge.conflictstyle = "diff3"; + alias.backport = let release = "14.04"; message = "Merge release ${release} into backports."; |