summaryrefslogtreecommitdiff
path: root/t/t3411-rebase-preserve-around-merges.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t3411-rebase-preserve-around-merges.sh')
-rwxr-xr-xt/t3411-rebase-preserve-around-merges.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3411-rebase-preserve-around-merges.sh b/t/t3411-rebase-preserve-around-merges.sh
index 14a23cd872..ace8e54e9b 100755
--- a/t/t3411-rebase-preserve-around-merges.sh
+++ b/t/t3411-rebase-preserve-around-merges.sh
@@ -37,7 +37,7 @@ test_expect_success 'setup' '
# -- C1 --
#
test_expect_success 'squash F1 into D1' '
- FAKE_LINES="1 squash 3 2" git rebase -i -p B1 &&
+ FAKE_LINES="1 squash 4 2 3" git rebase -i -p B1 &&
test "$(git rev-parse HEAD^2)" = "$(git rev-parse C1)" &&
test "$(git rev-parse HEAD~2)" = "$(git rev-parse B1)" &&
git tag E2