Code

Merge branch 'mz/maint-rebase-X-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:18:19 +0000 (13:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:18:19 +0000 (13:18 -0800)
* mz/maint-rebase-X-fix:
  t3402: test "rebase -s<strategy> -X<opt>"


Trivial merge