Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into maint-1.6.0

diff --git a/diffcore.h b/diffcore.h
index 8ae35785fd4439f466620ab9186838e7cb20fa36..1ebfdae8b8ba1ede00cddd17bfd0fb5610866d03 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -58,7 +58,7 @@ struct diff_filepair {
        struct diff_filespec *one;
        struct diff_filespec *two;
        unsigned short int score;
-       char status; /* M C R N D U (see Documentation/diff-format.txt) */
+       char status; /* M C R A D U etc. (see Documentation/diff-format.txt or DIFF_STATUS_* in diff.h) */
        unsigned broken_pair : 1;
        unsigned renamed_pair : 1;
        unsigned is_unmerged : 1;