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"