summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstuebinm2024-01-08 22:22:14 +0100
committerstuebinm2024-01-08 22:22:14 +0100
commit448cc99cafc8d9a254eb3375521b3cba640de7e6 (patch)
treeaec51181a9f5bbd0093cf6721d7e1d0262c0cf67
parent3c22e2200eab911fc79ebbb53e360307fb161067 (diff)
home: use zdiff3 for git
-rw-r--r--home/home-minimal.nix1
1 files changed, 1 insertions, 0 deletions
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;