X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/d851da81409f07105c55d5088157e276cbc4fe13..a2f4fe7de51cb580ca587d155f01ad569edd36ae:/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 ) "