aboutsummaryrefslogtreecommitdiff
path: root/gitconfig
diff options
context:
space:
mode:
authorRuben Beltran del Rio <git@r.bdr.sh>2024-02-19 20:17:51 +0100
committerRuben Beltran del Rio <git@r.bdr.sh>2024-02-19 20:17:51 +0100
commitf30e0a60de841c4f3fadf8ca4367352ae638d096 (patch)
tree9ea434c1422cd204a4358b4a7fb2c5fe2e36d3b5 /gitconfig
parentff40958cb9fa50b1e194849af0ffab32f1fc8cad (diff)
Update deps
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
index 8fca402..ff81aab 100644
--- a/gitconfig
+++ b/gitconfig
@@ -24,6 +24,7 @@
tool = vimdiff
[merge]
tool = nvim
+ conflictstyle = zdiff3
[mergetool]
keepBackup = false
[mergetool "nvim"]