Convert "sink" to the new infrastructure

[stgit] / t / t1501-sink.sh

diff --git a/t/t1501-sink.sh b/t/t1501-sink.sh
index 516aa44cfb3301a5602ea54d10ca014bc86daf8b..a0769dd99ba259f791aa2c9d0613148c6af158ad 100755 (executable)
--- 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"
 '