aboutsummaryrefslogtreecommitdiff
path: root/Documentation/diff-format.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-12-19 19:32:29 -0800
committerJunio C Hamano <gitster@pobox.com>2008-12-19 19:35:55 -0800
commitefe05b019ca19328d27c07ef32b4698a7f36166f (patch)
treea38d3c5713d39370e881c148ff0f5c9d4db59c67 /Documentation/diff-format.txt
parentec9f0ea3e6ecf1237223dec8428e7bb73d339320 (diff)
parent718258e256b74622aa55f5ee0cb9cff4cce6bf9f (diff)
downloadgit-efe05b019ca19328d27c07ef32b4698a7f36166f.tar.xz
Merge branch 'maint' to sync with GIT 1.6.0.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-format.txt')
-rw-r--r--Documentation/diff-format.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index aafd3a3941..1eeb1c7683 100644
--- 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.