chiark / gitweb /
Test for specific exit code
[stgit] / t / t2500-clean.sh
index ad8f892e624107e5c7104d4d77cd18dcbdba05ca..abde9cf7aabe92b1f9eccf9e3cbe265208d59470 100755 (executable)
@@ -32,7 +32,7 @@ test_expect_success 'Create a conflict' '
     stg new p2 -m p2
     echo quux > foo.txt &&
     stg refresh &&
-    ! stg push
+    conflict_old stg push
 '
 
 test_expect_success 'Make sure conflicting patches are preserved' '