Merge branch 'sb/show-branch-parse-options' into sb/opt-filename

diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index aafd3a394126e4718b593eb5727412e16d2334e4..1eeb1c76838c1911fc4d57b36a16dece0538809a 100644 (file)
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -58,7 +58,7 @@ Possible status letters are:
 be committed)
 - X: "unknown" change type (most probably a bug, please report it)
 
-Status letters C and M are always followed by a score (denoting the
+Status letters C and R are always followed by a score (denoting the
 percentage of similarity between the source and target of the move or
 copy), and are the only ones to be so.