X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/719309aa54c8fa43bd8700f09b1e293923ed4e0a..36a06e0194e013552499677e431e528ecb2faee9:/t/t1200-push-modified.sh diff --git a/t/t1200-push-modified.sh b/t/t1200-push-modified.sh index ba4f70c..6ebd0a1 100755 --- a/t/t1200-push-modified.sh +++ b/t/t1200-push-modified.sh @@ -49,7 +49,7 @@ test_expect_success \ test_expect_success \ 'Attempt to push the first of those patches without --merged' \ - "(cd bar && ! stg push + "(cd bar && conflict_old stg push ) "