From e7b19ee99336ac7ab66ef3d281cdaf2b9abe70a4 Mon Sep 17 00:00:00 2001 From: Steve Beaulac Date: Thu, 24 Sep 2026 15:59:47 -0400 Subject: [PATCH] chore(git): use zdiff3 conflict style for cleaner diffs --- config/git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/git/config b/config/git/config index 50a8581..479ca37 100644 --- a/config/git/config +++ b/config/git/config @@ -53,7 +53,7 @@ pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C( layout = BASE,MERGED + BASE,LOCAL + BASE,REMOTE [merge] -conflictStyle = diff3 +conflictStyle = zdiff3 summary = true verbosity = 1 tool = nvimdiff