X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/f749e393e47687971777d79c043562a91e4f493d..f03004e2c26efcd6b172a915e8e0d2f9a7cb064b:/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' '