X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/baf8241d1b7835ba31125d2b75683601ee2b0403..1d694f9b45e3dfef8916cf3d09e02ab4553f2030:/t/t1202-push-undo.sh diff --git a/t/t1202-push-undo.sh b/t/t1202-push-undo.sh index 79439de..14a3d6d 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' \ ' - conflict_old stg push bar + conflict stg push bar ' test_expect_success \ @@ -55,7 +55,7 @@ test_expect_success \ test_expect_success \ 'Check the push after undo fails as well' \ ' - conflict_old stg push bar + conflict stg push bar ' test_expect_success \