diff --git a/diff-files.c b/diff-files.c
index 7db5ce6407b9755e42445a7cf43d6dc5615bf3e7..b1c05b325a8f171fc67c204471db2cb5e98b0b50 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
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 */
show_file('-', ce);
continue;
}
- changed = ce_match_stat(ce, &st);
+ changed = ce_match_stat(ce, &st, 0);
if (!changed && !diff_options.find_copies_harder)
continue;
oldmode = ntohl(ce->ce_mode);