diff options
| author | Dennis Eriksen <d@ennis.no> | 2024-04-04 10:31:43 +0200 |
|---|---|---|
| committer | Dennis Eriksen <d@ennis.no> | 2024-04-04 10:31:43 +0200 |
| commit | 4f96ad810fe143908a6e445bdd4e8bb3c2465a1e (patch) | |
| tree | e33542201fc7e914639ece8fd2e99d98f4fc46dd | |
| parent | fix: wildoptions=pum was added in vim 9 (diff) | |
| download | idgatt-4f96ad810fe143908a6e445bdd4e8bb3c2465a1e.tar.gz | |
fix: zdiff3 was only added in git 2.35
| -rw-r--r-- | config/.config/git/config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config/.config/git/config b/config/.config/git/config index 3ba90cd..e7aeb7f 100644 --- a/config/.config/git/config +++ b/config/.config/git/config @@ -85,8 +85,7 @@ [merge] - # https://ductile.systems/zdiff3/ - conflictStyle = zdiff3 + conflictStyle = diff3 # Include summaries of merged commits in newly created merge commit messages log = true |