Merge branch 'jt/accept-capability-advertisement-when-fetching-from-void'

diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index f10fd549b48af512551244ec98b4032b8d212488..cf5262622f6a7f82b3989cbcb4ee1ebd4652b220 100644 (file)
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -86,7 +86,7 @@ diff format for merges
 ----------------------
 
 "git-diff-tree", "git-diff-files" and "git-diff --raw"
-can take `-c` or '--cc' option
+can take `-c` or `--cc` option
 to generate diff output also for merge commits.  The output differs
 from the format described above in the following way: