X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/d851da81409f07105c55d5088157e276cbc4fe13..de8efe1efc4a495eca0614aa9f6c1910d5838f99:/t/t2101-pull-policy-pull.sh

diff --git a/t/t2101-pull-policy-pull.sh b/t/t2101-pull-policy-pull.sh
index ce4b5c8..35c15ad 100755
--- a/t/t2101-pull-policy-pull.sh
+++ b/t/t2101-pull-policy-pull.sh
@@ -22,7 +22,7 @@ test_expect_success \
      git config branch.master.stgit.pull-policy pull &&
      git config --list &&
      stg new c1 -m c1 &&
-     echo a > file && git add file && stg refresh
+     echo a > file && stg add file && stg refresh
     )
     '
 
@@ -30,7 +30,7 @@ test_expect_success \
     'Add non-rewinding commit upstream and pull it from clone' \
     '
     (cd upstream && stg new u1 -m u1 &&
-     echo a > file2 && git add file2 && stg refresh) &&
+     echo a > file2 && stg add file2 && stg refresh) &&
     (cd clone && stg pull) &&
      test -e clone/file2
     '
@@ -43,13 +43,13 @@ test_expect_success \
     'Rewind/rewrite upstream commit and pull it from clone, without --merged' \
     '
     (cd upstream && echo b >> file2 && stg refresh) &&
-    (cd clone && ! stg pull)
+    (cd clone && conflict_old stg pull)
     '
 
 test_expect_success \
     '"Solve" the conflict (pretend there is none)' \
     '(cd clone &&
-      git add file2 && EDITOR=cat git commit)'
+      stg add file2 && EDITOR=cat git commit)'
 
 test_expect_success \
     'Push the stack back' \