Merge branch 'jc/nostat'

diff --git a/diff.h b/diff.h
index 946a4067cc4c56cb5d4b79ff13e9aecb4d99b336..8fac465a9df9b1d8789d17f008968295baa27ad1 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -66,6 +66,7 @@ struct combine_diff_path {
        unsigned int mode;
        unsigned char sha1[20];
        struct combine_diff_parent {
+               char status;
                unsigned int mode;
                unsigned char sha1[20];
        } parent[FLEX_ARRAY];