X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/78e5af69d99659769b052e4c00fe5b23a8356231..36a06e0194e013552499677e431e528ecb2faee9:/t/t2000-sync.sh diff --git a/t/t2000-sync.sh b/t/t2000-sync.sh index e489603..9852eb8 100755 --- a/t/t2000-sync.sh +++ b/t/t2000-sync.sh @@ -109,7 +109,7 @@ test_expect_success \ test_expect_success \ 'Synchronise the first two patches with the master branch (to fail)' \ ' - ! stg sync -B master -a + conflict_old stg sync -B master -a ' test_expect_success \ @@ -127,7 +127,7 @@ test_expect_success \ test_expect_success \ 'Synchronise the third patch with the exported series (to fail)' \ ' - ! stg sync -s patches-master/series p3 + conflict_old stg sync -s patches-master/series p3 ' test_expect_success \