X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-files.c;h=0c3f80046b51abd3c44da61a71dce7da3a712518;hb=b992933853ccffac85f7e40310167ef7b8f0432e;hp=7db5ce6407b9755e42445a7cf43d6dc5615bf3e7;hpb=3f6726e1f112d221bd2a919e9b1b2927aeef6150;p=git.git

diff --git a/diff-files.c b/diff-files.c
index 7db5ce64..0c3f8004 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 */