From ffc92a667194f930f35405d534f984956de17b8d Mon Sep 17 00:00:00 2001 From: Jeremy Kaplan Date: Sat, 17 Oct 2026 14:06:13 -0400 Subject: [PATCH] git: Use meld for merge conflicts --- git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/config b/git/config index 2b33e39..514dfc4 100644 --- a/git/config +++ b/git/config @@ -51,7 +51,7 @@ date = iso [merge] conflictStyle = zdiff3 ff = only -tool = nvimdiff +tool = meld [pager] difftool = true