aboutsummaryrefslogtreecommitdiff
path: root/config/all
diff options
context:
space:
mode:
Diffstat (limited to 'config/all')
-rw-r--r--config/all/git/config10
1 files changed, 8 insertions, 2 deletions
diff --git a/config/all/git/config b/config/all/git/config
index 0a3bed8..71bf668 100644
--- a/config/all/git/config
+++ b/config/all/git/config
@@ -27,11 +27,17 @@
keepTemporaries = false
prompt = false
+[mergetool "vimdiff"]
+ layout = "LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE"
+
[merge]
- tool = meld
+ tool = vimdiff
+ conflictstyle = zdiff3
[diff]
- tool = meld
+ tool = vimdiff
+ colorMoved = default
+ algorithm = histogram
[init]
defaultBranch = main