git-rebase--interactive.sh: Make 3-way merge strategies work for -p.
commitf91333d646e690d9a10717c96e166a069b2bb586
authorBjörn Steinbrink <B.Steinbrink@gmx.de>
Wed, 31 Oct 2007 02:20:32 +0000 (31 03:20 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 31 Oct 2007 04:29:28 +0000 (30 21:29 -0700)
tree130522dbb2b910823e5bcf4b95f1fdccd3946a25
parent2a9c53e03d8293577b5163910f178075725b39dd
git-rebase--interactive.sh: Make 3-way merge strategies work for -p.

git-rebase--interactive.sh used to pass all parents of a merge commit to
git-merge, which means that we have at least 3 heads to merge: HEAD,
first parent and second parent. So 3-way merge strategies like recursive
wouldn't work.

Fortunately, we have checked out the first parent right before the merge
anyway, so that is HEAD. Therefore we can drop simply it from the list
of parents, making 3-way strategies work for merge commits with only
two parents.

Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--interactive.sh