X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/7a6a45b5f1379466bd23b33a7feed47d0b8331b7..ff3db0e4da2b61c858766adf5237c2877ffd411b:/t/t1202-push-undo.sh?ds=inline diff --git a/t/t1202-push-undo.sh b/t/t1202-push-undo.sh index b602643..544fe8d 100755 --- a/t/t1202-push-undo.sh +++ b/t/t1202-push-undo.sh @@ -43,7 +43,7 @@ test_expect_success \ test_expect_success \ 'Push the second patch with conflict' \ ' - ! stg push bar + conflict_old stg push bar ' test_expect_success \ @@ -55,7 +55,7 @@ test_expect_success \ test_expect_success \ 'Check the push after undo fails as well' \ ' - ! stg push bar + conflict_old stg push bar ' test_expect_success \