X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/719309aa54c8fa43bd8700f09b1e293923ed4e0a..ff3db0e4da2b61c858766adf5237c2877ffd411b:/t/t1203-push-conflict.sh diff --git a/t/t1203-push-conflict.sh b/t/t1203-push-conflict.sh index 72bd49f..96fee15 100755 --- a/t/t1203-push-conflict.sh +++ b/t/t1203-push-conflict.sh @@ -38,7 +38,7 @@ test_expect_success \ test_expect_success \ 'Push the first patch with conflict' \ ' - ! stg push foo + conflict_old stg push foo ' test_expect_success \ @@ -56,7 +56,7 @@ test_expect_success \ test_expect_success \ 'Check that pop will fail while there are unmerged conflicts' \ ' - ! stg pop + command_error stg pop ' test_expect_success \