X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/d756053f114b1fdf46c2694e940f1197822afcc7..a0045b8750ffa368be49de692dc309d0a7459eb2:/t/t1203-push-conflict.sh diff --git a/t/t1203-push-conflict.sh b/t/t1203-push-conflict.sh index 96fee15..8027e6c 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' \ ' - conflict_old stg push foo + conflict stg push foo ' test_expect_success \