X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/d926892f4f058326d8e7efc61f7ae4f54b8a02b2..cb1570e14f5e021ccd6580f207fdc6297611fc49:/t/t1202-push-undo.sh 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 \