chiark / gitweb /
Convert "push" to the lib infrastructure
[stgit] / t / t1202-push-undo.sh
index 79439deae584099c5dad527c660c0eee4eca8ca7..14a3d6d0d684e9a07501c9198bf9880f8dbd307d 100755 (executable)
@@ -43,7 +43,7 @@ test_expect_success \
 test_expect_success \
        'Push the second patch with conflict' \
        '
-       conflict_old stg push bar
+       conflict stg push bar
        '
 
 test_expect_success \
@@ -55,7 +55,7 @@ test_expect_success \
 test_expect_success \
        'Check the push after undo fails as well' \
        '
-       conflict_old stg push bar
+       conflict stg push bar
        '
 
 test_expect_success \