diff options
Diffstat (limited to 't/t3409-rebase-preserve-merges.sh')
| -rwxr-xr-x | t/t3409-rebase-preserve-merges.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh index 8f785e7957..1a362d231a 100755 --- a/t/t3409-rebase-preserve-merges.sh +++ b/t/t3409-rebase-preserve-merges.sh @@ -42,23 +42,23 @@ test_expect_success 'setup for merge-preserving rebase' \ git commit -a -m "Modify A2" && git clone ./. clone1 && - cd clone1 && + (cd clone1 && git checkout -b topic origin/topic && - git merge origin/master && - cd .. && + git merge origin/master + ) && echo Fifth > B && git add B && git commit -m "Add different B" && git clone ./. clone2 && - cd 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 .. && + git commit -m "Merge origin/master into topic" + ) && git checkout topic && echo Fourth >> B && |