Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint

diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index f1101c7b218877247067ae282398594e2410ebed..d5a5b17d508839bc379821ee1a318400a3557fe9 100644 (file)
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -105,7 +105,7 @@ diff.orderFile::
 
 diff.renameLimit::
        The number of files to consider when performing the copy/rename
-       detection; equivalent to the 'git diff' option '-l'.
+       detection; equivalent to the 'git diff' option `-l`.
 
 diff.renames::
        Whether and how Git detects renames.  If set to "false",