X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-files.c;h=b1c05b325a8f171fc67c204471db2cb5e98b0b50;hb=8978d043c35ad068e280dbbdc31e06524ea0ab56;hp=574294f30254c3082820aa678b6df353540fefbf;hpb=3acfbd7cf87b8a2d28dc8878d23c64994934d63e;p=git.git

diff --git a/diff-files.c b/diff-files.c
index 574294f3..b1c05b32 100644
--- 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 */