From ca433a0ecab5638e379c58cf1cf2fd743c02eda2 Mon Sep 17 00:00:00 2001 From: Alpha Chen Date: Fri, 16 Feb 2024 20:50:11 -0800 Subject: [PATCH] merge.conflictstyle zdiff3 https://ductile.systems/zdiff3/ --- .gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitconfig b/.gitconfig index 81b6c50..b39acb4 100644 --- a/.gitconfig +++ b/.gitconfig @@ -44,7 +44,7 @@ [apply] whitespace = warn [merge] - conflictstyle = diff3 + conflictstyle = zdiff3 ff = false tool = vimdiff [mergetool "vimdiff"]