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