Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
authorJunio C Hamano <junkio@cox.net>
Sat, 7 Apr 2007 12:49:19 +0000 (05:49 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 10 Apr 2007 19:55:51 +0000 (12:55 -0700)
commit4c4caafc9cef1031beb46babe9adfdcc03f3cd52
tree0a15dd43bef36ecd2c14198cbddd503fc65396d7
parentea4b52a86f6b6b8e5aef8e47fb557f37422512bf
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>
unpack-trees.c