X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/a05954efcf4fce744252ce2e1a650b78fa5788d6..33ff9cdd840cfe2780acc41d88d33c8c3bc2761e:/t/t1400-patch-history.sh

diff --git a/t/t1400-patch-history.sh b/t/t1400-patch-history.sh
index a693e75..13cd1e3 100755
--- a/t/t1400-patch-history.sh
+++ b/t/t1400-patch-history.sh
@@ -82,7 +82,7 @@ test_expect_success \
 	echo bar > test && stg refresh &&
 	stg pop &&
 	echo foo > test && stg refresh &&
-	! stg push &&
+	conflict_old stg push &&
 	stg log --full | grep -q -e "^push(c) "
 	'