diff options
| author | Matt Singleton <matt@xcolour.net> | 2024-04-11 09:57:22 -0500 |
|---|---|---|
| committer | Matt Singleton <matt@xcolour.net> | 2024-04-11 09:57:22 -0500 |
| commit | 7f67d28e18760154778f20da43772838c36734ed (patch) | |
| tree | d83f9e205e6fd2cff004e99f7c3aff5b78d73e5f /config/all | |
| parent | 6903af7a438ad42a84e9c3039ecaf848ff012ab1 (diff) | |
vimdiff for git mergetool
Diffstat (limited to 'config/all')
| -rw-r--r-- | config/all/git/config | 10 |
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 |