X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/baf8241d1b7835ba31125d2b75683601ee2b0403..48d0a85006ac9c58a277391ffdae5560f0a75cbb:/t/t1501-sink.sh diff --git a/t/t1501-sink.sh b/t/t1501-sink.sh index 516aa44..a0769dd 100755 --- a/t/t1501-sink.sh +++ b/t/t1501-sink.sh @@ -58,7 +58,7 @@ test_expect_success 'sink specified patch below a target' ' ' test_expect_success 'sink with conflict' ' - conflict_old stg sink --to=p2 p22 && + conflict stg sink --to=p2 p22 && test "$(echo $(stg series --applied --noprefix))" = "p1 p22" && test "$(echo $(stg status -c))" = "f2" '