diff options
Diffstat (limited to 't/t3409-rebase-preserve-merges.sh')
| -rwxr-xr-x | t/t3409-rebase-preserve-merges.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh index 1a362d2..74161a4 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 && |