chiark / gitweb /
Convert "push" to the lib infrastructure
[stgit] / t / t0002-status.sh
index d95a83b64e438adda1fe526d01d340d83d142455..ffcad7752f7d56a35de377e0108b8cc79e72c29f 100755 (executable)
@@ -111,7 +111,7 @@ A fie
 C foo/bar
 EOF
 test_expect_success 'Status after conflicting push' '
-    conflict_old stg push &&
+    conflict stg push &&
     stg status > output.txt &&
     test_cmp expected.txt output.txt
 '