Test for specific exit code

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

diff --git a/t/t1200-push-modified.sh b/t/t1200-push-modified.sh
index ba4f70c43714979f287064d6d6581493ef8f1964..6ebd0a1333dce2ad78e653c3616a697f7832c7c3 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 && ! stg push
+    "(cd bar && conflict_old stg push

      )
 "
 
      )
 "