diff options
| -rw-r--r-- | diff-files.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/diff-files.c b/diff-files.c index 7db5ce640..0c3f80046 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 */ |