Merge branch 'ic/maint-rebase-i-abort' into maint
commitb2ebbd8f1311608622ede7a1286839ef64edfc86
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jun 2010 16:31:48 +0000 (22 09:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jun 2010 16:31:48 +0000 (22 09:31 -0700)
treed0967e6b40cfd76242c7447f22c2b70958fb863d
parent81b43b54b2b6cfe917820b26bf206254d8b6738e
parentb096374f4a2cec0403378c1e9b4fb5fe37b517f4
Merge branch 'ic/maint-rebase-i-abort' into maint

* ic/maint-rebase-i-abort:
  rebase -i: Abort cleanly if new base cannot be checked out
t/t3404-rebase-interactive.sh