diff options
| -rw-r--r-- | home/home-minimal.nix | 1 |
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; |