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)
commit5d268edff8a271fe68f525e8d382a13b96c71a81
tree58a610f4a1bed6d647c824617d6a95236f99999d
parent11fe3f73cce13b759a728b0a9ac95e745470f251
parent71fc224fe8af9202eb60c98a128150fd0ae23090
Merge branch 'mz/maint-rebase-X-fix' into maint

* mz/maint-rebase-X-fix:
  t3402: test "rebase -s<strategy> -X<opt>"