Add install-html target to makefile

[stgit] / t / t1202-push-undo.sh

diff --git a/t/t1202-push-undo.sh b/t/t1202-push-undo.sh
index edfa710..544fe8d 100755 (executable)
--- a/t/t1202-push-undo.sh
+++ b/t/t1202-push-undo.sh
@@ -21,7 +21,7 @@ test_expect_success \
        '
        stg new foo -m foo &&
        echo foo > test &&
-       stg add test &&
+       git add test &&
        stg refresh
        '
 
@@ -30,7 +30,7 @@ test_expect_success \
        '
        stg new bar -m bar &&
        echo bar > test &&
-       stg add test &&
+       git add test &&
        stg refresh
        '
 
@@ -43,7 +43,7 @@ test_expect_success \
 test_expect_success \
        'Push the second patch with conflict' \
        '
-       ! stg push bar
+       conflict_old stg push bar
        '
 
 test_expect_success \
@@ -55,14 +55,14 @@ test_expect_success \
 test_expect_success \
        'Check the push after undo fails as well' \
        '
-       ! stg push bar
+       conflict_old stg push bar
        '
 
 test_expect_success \
        'Undo with disappeared newborn' \
        '
        touch newfile &&
-       stg add newfile &&
+       git add newfile &&
        rm newfile &&
        stg push --undo
        '