X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/1eae3bf5ef8561508d83845f27b61c7533ba3378..a2f4fe7de51cb580ca587d155f01ad569edd36ae:/t/t1202-push-undo.sh?ds=sidebyside 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 \