[PATCH] diff-raw format update take #2.

diff --git a/diffcore.h b/diffcore.h
index 7b1cd4a059be96018f2d78784afbe9181a3fb12d..c709cddc42d565fa4e68de87ffff4cf3842fa8b1 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -47,6 +47,7 @@ struct diff_filepair {
                          * certain ordering of patches that later
                          * diffcore transformations should not break.
                          */
+       int status; /* M C R N D U (see Documentation/diff-format.txt) */
 };
 #define DIFF_PAIR_UNMERGED(p) \
        (!DIFF_FILE_VALID((p)->one) && !DIFF_FILE_VALID((p)->two))