From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Nov 2010 21:18:19 +0000 (-0800)
Subject: Merge branch 'mz/maint-rebase-X-fix' into maint
X-Git-Tag: v1.7.3.3~35
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5d268edff8a271fe68f525e8d382a13b96c71a81;p=git-core%2Fgit.git

Merge branch 'mz/maint-rebase-X-fix' into maint

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

5d268edff8a271fe68f525e8d382a13b96c71a81