From 448cc99cafc8d9a254eb3375521b3cba640de7e6 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Mon, 8 Jan 2024 22:22:14 +0100 Subject: home: use zdiff3 for git --- home/home-minimal.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/home-minimal.nix b/home/home-minimal.nix index bae85bc..facec46 100644 --- a/home/home-minimal.nix +++ b/home/home-minimal.nix @@ -90,6 +90,7 @@ log.showSignature = true; init.defaultBranch = "main"; alias.search = "!git log --format='tformat:%h %cs %s' --no-show-signature | fzf --multi --preview 'git show {+1}|bat -p -lpatch --color=always' | cut -f1 -d\" \" | wl-copy -n && wl-paste"; + merge.conflictStyle = "zdiff3"; }; # diff-so-fancy.enable = true; -- cgit v1.2.3