diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-23 20:35:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-23 20:35:16 (GMT) |
| commit | 12219414dd4b114081374361101ac2de65e0f1d7 (patch) | |
| tree | 3d4af2789869164f8050f43ac537329069bd9b02 /t | |
| parent | c0f31b83a63f8b3aef0ec28225a50b6bae542d68 (diff) | |
| parent | 9ef5b2bd166aa390778d7dcda58714ee222d7377 (diff) | |
| download | git-12219414dd4b114081374361101ac2de65e0f1d7.zip git-12219414dd4b114081374361101ac2de65e0f1d7.tar.gz git-12219414dd4b114081374361101ac2de65e0f1d7.tar.bz2 | |
Merge branch 'js/rebase-i-p-test-fix'
By Johannes Sixt
* js/rebase-i-p-test-fix:
Fix t3411.3 to actually rebase something
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3411-rebase-preserve-around-merges.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t3411-rebase-preserve-around-merges.sh b/t/t3411-rebase-preserve-around-merges.sh index ace8e54..dc81bf2 100755 --- a/t/t3411-rebase-preserve-around-merges.sh +++ b/t/t3411-rebase-preserve-around-merges.sh @@ -56,6 +56,7 @@ test_expect_success 'squash F1 into D1' ' # And rebase G1..M1 onto E2 test_expect_success 'rebase two levels of merge' ' + git checkout A1 && test_commit G1 && test_commit H1 && test_commit I1 && |