Merge branch 'js/rebase-i-p-test-fix'

By Johannes Sixt * js/rebase-i-p-test-fix: Fix t3411.3 to actually rebase something
2012-05-23 13:35:15 -07:00 · 2012-05-23 13:35:15 -07:00 · 12219414dd
commit 12219414dd
parent c0f31b83a6 9ef5b2bd16
1 changed files with 1 additions and 0 deletions
--- 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 &&