diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-14 07:07:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-14 07:07:04 (GMT) |
| commit | 713a11fceb662f275b5e1294acc6f38674834941 (patch) | |
| tree | b2487665a50988478fa8f2363349c18cb1b91946 /apply.c | |
| parent | 365463851303f74eb5e5be7101811f215602fcd9 (diff) | |
| download | git-713a11fceb662f275b5e1294acc6f38674834941.zip git-713a11fceb662f275b5e1294acc6f38674834941.tar.gz git-713a11fceb662f275b5e1294acc6f38674834941.tar.bz2 | |
combine-diff: diff-files fix.
When showing a conflicted merge from index stages and working
tree file, we did not fetch the mode from the working tree,
and mistook that as a deleted file. Also if the manual
resolution (or automated resolution by git rerere) ended up
taking either parent's version, we did not show _anything_ for
that path. Either was quite bad and confusing.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'apply.c')
0 files changed, 0 insertions, 0 deletions