| commit | 713a11fceb662f275b5e1294acc6f38674834941 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 14 Feb 2006 07:07:04 +0000 (13 23:07 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 14 Feb 2006 07:07:04 +0000 (13 23:07 -0800) | ||
| tree | b2487665a50988478fa8f2363349c18cb1b91946 | treesnapshot (tar.gz zip) |
| parent | 365463851303f74eb5e5be7101811f215602fcd9 | commitdiff |
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>
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>
| combine-diff.c | diffblobblamehistory |