X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/ddca05489313c16e5a0386d26d52568113f8ec46..7c11b7547f2063327b1a3697df493ad0f707cea3:/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 \