diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-01 20:24:04 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-16 14:38:47 -0700 |
| commit | cff4243db9eec386c17222d545ec7dbf51768672 (patch) | |
| tree | a078a9c392c1815e2ebda25fb04deb4add555258 /t/t9165-git-svn-fetch-merge-branch-of-branch.sh | |
| parent | e974e06de01aede87161fb04cfeb119343bb7594 (diff) | |
| download | git-cff4243db9eec386c17222d545ec7dbf51768672.tar.gz | |
t9000-t9999: fix broken &&-chains
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9165-git-svn-fetch-merge-branch-of-branch.sh')
| -rwxr-xr-x | t/t9165-git-svn-fetch-merge-branch-of-branch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9165-git-svn-fetch-merge-branch-of-branch.sh b/t/t9165-git-svn-fetch-merge-branch-of-branch.sh index fa3ef3b1f7..a4813c2b09 100755 --- a/t/t9165-git-svn-fetch-merge-branch-of-branch.sh +++ b/t/t9165-git-svn-fetch-merge-branch-of-branch.sh @@ -39,7 +39,7 @@ test_expect_success 'initialize source svn repo' ' svn_cmd commit -m trunk && svn_cmd switch "$svnrepo"/branches/branch2 && svn_cmd merge "$svnrepo"/trunk && - svn_cmd commit -m "merge trunk" + svn_cmd commit -m "merge trunk" && svn_cmd switch "$svnrepo"/trunk && svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 && svn_cmd commit -m "merge branch2" |