Remove "stg add"

[stgit] / t / t1203-push-conflict.sh

diff --git a/t/t1203-push-conflict.sh b/t/t1203-push-conflict.sh
index f9537d9..72bd49f 100755 (executable)
--- a/t/t1203-push-conflict.sh
+++ b/t/t1203-push-conflict.sh
@@ -21,7 +21,7 @@ test_expect_success \
        stg new foo -m foo &&
        echo foo > test &&
        echo fie > test2 &&
-       stg add test test2 &&
+       git add test test2 &&
        stg refresh &&
         stg pop
        '
@@ -31,7 +31,7 @@ test_expect_success \
        '
        stg new bar -m bar &&
        echo bar > test &&
-       stg add test &&
+       git add test &&
        stg refresh
        '
 
@@ -54,6 +54,12 @@ test_expect_success \
        '
 
 test_expect_success \
+       'Check that pop will fail while there are unmerged conflicts' \
+       '
+       ! stg pop
+       '
+
+test_expect_success \
        'Resolve the conflict' \
        '
        echo resolved > test &&