Merge branch 'ic/maint-rebase-i-abort' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jun 2010 16:31:48 +0000 (09:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jun 2010 16:31:48 +0000 (09:31 -0700)
* ic/maint-rebase-i-abort:
rebase -i: Abort cleanly if new base cannot be checked out

1  2 
t/t3404-rebase-interactive.sh
Simple merge