From 6046cb2df72352cc27d7a27526859530c2888921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Fri, 17 Nov 2023 19:56:56 +0100 Subject: [PATCH] Add git difftool: meld --- config/git/config | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/git/config b/config/git/config index b99c120..436af10 100644 --- a/config/git/config +++ b/config/git/config @@ -16,4 +16,9 @@ required = true [pull] ff = only - +[diff] + tool = meld +[difftool] + prompt = false +[difftool "meld"] + cmd = meld "$LOCAL" "$REMOTE"