X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/850c3a89476ba8608b2deeba109fa7def2607655..d6e17ce04e5b6e766bec35f7c7e56d1b5139b307:/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' '