diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-07 16:49:19 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-10 23:55:51 +0400 |
| commit | 4c4caafc9cef1031beb46babe9adfdcc03f3cd52 (patch) | |
| tree | 0a15dd43bef36ecd2c14198cbddd503fc65396d7 /merge-recursive.c | |
| parent | ea4b52a86f6b6b8e5aef8e47fb557f37422512bf (diff) | |
Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
This fixes three buglets in threeway_merge() regarding D/F
conflict entries.
* After finishing with path D and handling path D/F, some stages
have D/F conflict entry which are obviously non-NULL. For the
purpose of determining if the path D/F is missing in the
ancestor, they should not be taken into account.
* D/F conflict entry is a marker to say "this stage does _not_
have the path", so do not send them to keep_entry().
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions