X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/9b4a6e70a1390d653201e48e12d09005b3fba6c8..f249607484ed865696bd96a2055468b98b4e319f:/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 \