X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/78e5af69d99659769b052e4c00fe5b23a8356231..29a8a0c94fb61b2a907afd9a9684cff058b9498a:/t/t2500-clean.sh diff --git a/t/t2500-clean.sh b/t/t2500-clean.sh index ad8f892..abde9cf 100755 --- a/t/t2500-clean.sh +++ b/t/t2500-clean.sh @@ -32,7 +32,7 @@ test_expect_success 'Create a conflict' ' stg new p2 -m p2 echo quux > foo.txt && stg refresh && - ! stg push + conflict_old stg push ' test_expect_success 'Make sure conflicting patches are preserved' '