X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/ea5b7bf3533205be4268d8e7d79198344161c819..a0045b8750ffa368be49de692dc309d0a7459eb2:/t/t1203-push-conflict.sh

diff --git a/t/t1203-push-conflict.sh b/t/t1203-push-conflict.sh
index 72bd49f..8027e6c 100755
--- a/t/t1203-push-conflict.sh
+++ b/t/t1203-push-conflict.sh
@@ -38,7 +38,7 @@ test_expect_success \
 test_expect_success \
 	'Push the first patch with conflict' \
 	'
-	! stg push foo
+	conflict stg push foo
 	'
 
 test_expect_success \
@@ -56,7 +56,7 @@ test_expect_success \
 test_expect_success \
 	'Check that pop will fail while there are unmerged conflicts' \
 	'
-	! stg pop
+	command_error stg pop
 	'
 
 test_expect_success \