Convert "push" to the lib infrastructure
[stgit] / t / t2500-clean.sh
index 99fd29f..7f821f5 100755 (executable)
@@ -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' '