From 4f96ad810fe143908a6e445bdd4e8bb3c2465a1e Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Thu, 4 Apr 2024 10:31:43 +0200 Subject: fix: zdiff3 was only added in git 2.35 --- config/.config/git/config | 3 +-- 1 file changed, 1 insertion(+), 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 -- cgit v1.2.3