Merge commit 'kha/safe'

[stgit] / t / t1200-push-modified.sh

diff --git a/t/t1200-push-modified.sh b/t/t1200-push-modified.sh
index a591124b97d07a5fd8fd437edfe6413c903493a6..2077492fbb9f9ec6821fc60ace0fbe340a2057de 100755 (executable)
--- a/t/t1200-push-modified.sh
+++ b/t/t1200-push-modified.sh
@@ -49,7 +49,7 @@ test_expect_success \
 
 test_expect_success \
     'Attempt to push the first of those patches without --merged' \
 
 test_expect_success \
     'Attempt to push the first of those patches without --merged' \

-    "(cd bar && conflict_old stg push
+    "(cd bar && conflict stg push

      )
 "
 
      )
 "