| commit | 5d268edff8a271fe68f525e8d382a13b96c71a81 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Nov 2010 21:18:19 +0000 (17 13:18 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Nov 2010 21:18:19 +0000 (17 13:18 -0800) | ||
| tree | 58a610f4a1bed6d647c824617d6a95236f99999d | treesnapshot (tar.gz zip) |
| parent | 11fe3f73cce13b759a728b0a9ac95e745470f251 | commitdiff |
| parent | 71fc224fe8af9202eb60c98a128150fd0ae23090 | commitdiff |
Merge branch 'mz/maint-rebase-X-fix' into maint
* mz/maint-rebase-X-fix:
t3402: test "rebase -s<strategy> -X<opt>"
* mz/maint-rebase-X-fix:
t3402: test "rebase -s<strategy> -X<opt>"