git-rebase--interactive.sh: Make 3-way merge strategies work for -p.
authorBjörn Steinbrink <B.Steinbrink@gmx.de>
Wed, 31 Oct 2007 02:20:32 +0000 (03:20 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 31 Oct 2007 04:29:28 +0000 (21:29 -0700)
commitf91333d...46e690d9a10717c96e166a069b2bb586
tree130522d...b2b910823e5bcf4b95f1fdccd3946a25copy hash to clipboard (tree)
parent2a9c53e...3d8293577b5163910f178075725b39ddcopy hash to clipboard (diff)
git-rebase--interactive.sh