X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3409-rebase-preserve-merges.sh;h=74161a42ec34c2d33780a80425ec1be5a4028f03;hb=0c61c6de3497900616b66a65dc41b27544131ed5;hp=1a362d231a21a03673cc41281db12673363894e1;hpb=347c47e61e5daf1efb3503724a431e4316c6eb5b;p=git.git

diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh
index 1a362d231..74161a42e 100755
--- a/t/t3409-rebase-preserve-merges.sh
+++ b/t/t3409-rebase-preserve-merges.sh
@@ -52,12 +52,13 @@ test_expect_success 'setup for merge-preserving rebase' \
 	git commit -m "Add different B" &&
 
 	git clone ./. clone2 &&
-	(cd clone2 &&
-	git checkout -b topic origin/topic &&
-	test_must_fail git merge origin/master &&
-	echo Resolved > B &&
-	git add B &&
-	git commit -m "Merge origin/master into topic"
+	(
+		cd clone2 &&
+		git checkout -b topic origin/topic &&
+		test_must_fail git merge origin/master &&
+		echo Resolved >B &&
+		git add B &&
+		git commit -m "Merge origin/master into topic"
 	) &&
 
 	git checkout topic &&