Merge branch 'rs/rm-strbuf-optim' into maint

diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 333cf6ff91c59fd96b587257ad413268df9a1458..224fb3090bba3f9dfd98448019a2ff6303b268f7 100644 (file)
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -98,7 +98,7 @@ instead.  `--no-symlinks` is the default on Windows.
        invoked diff tool returns a non-zero exit code.
 +
 'git-difftool' will forward the exit code of the invoked tool when
-'--trust-exit-code' is used.
+`--trust-exit-code` is used.
 
 See linkgit:git-diff[1] for the full list of supported options.