Junio C Hamano 160252f816 git-merge-ours: make sure our index matches HEAD ...

git-merge expects this check to be done appropriately by the
merge strategy backends.  In the case of merge-ours strategy,
the resulting tree comes what we have in the index file, so it
must match the current HEAD; otherwise it would not be "ours"
merge.

Signed-off-by: Junio C Hamano <junkio@cox.net>

2005-11-03 14:55:11 -08:00

356 B

Executable File

Raw Blame History

View Raw