X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/ddca05489313c16e5a0386d26d52568113f8ec46..58f09cf20b44f502fc56d56383461b71b7ae42fd:/t/t2500-clean.sh diff --git a/t/t2500-clean.sh b/t/t2500-clean.sh index 99fd29f..7f821f5 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 && - conflict_old stg push + conflict stg push ' test_expect_success 'Make sure conflicting patches are preserved' '