From 72241550310c62de3d5b8be3bc2bdadcec86f51d Mon Sep 17 00:00:00 2001 From: Enno Date: Tue, 9 Sep 2025 16:56:07 +0200 Subject: [PATCH] escape quotes I had not luck with these unescaped quotes; if added to the config via `git config` they likely get escaped automatically, but if done so directly in git's config file they seem to need escaping --- manual/src/git.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manual/src/git.md b/manual/src/git.md index 0e8d591a70..713ce82864 100644 --- a/manual/src/git.md +++ b/manual/src/git.md @@ -112,7 +112,7 @@ To define a difftool named `difftastic`, add the following to your ```ini [difftool "difftastic"] # See `man git-difftool` for a description of MERGED, LOCAL and REMOTE. - cmd = difft "$MERGED" "$LOCAL" "abcdef1" "100644" "$REMOTE" "abcdef2" "100644" + cmd = difft \"$MERGED\" \"$LOCAL\" \"abcdef1\" \"100644\" \"$REMOTE\" \"abcdef2\" \"100644\" ``` You can now use difftastic as a difftool: