From 710e853a8d7745f606bb840b1e11577c58bb42f2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 6 Jul 2021 09:06:52 +0200 Subject: workstation: Switch Git conflict style to diff3 I've been using vimdiff3 as the merge tool for a long time, but while it has worked fine for most conflicts, using diff3 makes the original lines visible which I always viewed in a separate shell rather than inline in the editor. Switching this to diff3 should hopefully make merge conflicts more convenient to solve from now on. Signed-off-by: aszlig --- modules/user/aszlig/profiles/workstation/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'modules') 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."; -- cgit 1.4.1