Merge branch 'pj/portable' into next

diff --git a/diff-files.c b/diff-files.c
index 574294f30254c3082820aa678b6df353540fefbf..b1c05b325a8f171fc67c204471db2cb5e98b0b50 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
@@ -150,6 +150,8 @@ int main(int argc, const char **argv)
                                               nce->sha1, 20);
                                        combine.p.parent[stage-2].mode =
                                                DIFF_FILE_CANON_MODE(mode);
+                                       combine.p.parent[stage-2].status =
+                                               DIFF_STATUS_MODIFIED;
                                }
 
                                /* diff against the proper unmerged stage */