X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/52e96a352da165a8b56dec8df9b026392fc8dd97..29a8a0c94fb61b2a907afd9a9684cff058b9498a:/t/t2500-clean.sh

diff --git a/t/t2500-clean.sh b/t/t2500-clean.sh
index b38d868..abde9cf 100755
--- a/t/t2500-clean.sh
+++ b/t/t2500-clean.sh
@@ -32,10 +32,10 @@ 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_failure 'Make sure conflicting patches are preserved' '
+test_expect_success 'Make sure conflicting patches are preserved' '
     stg clean &&
     [ "$(echo $(stg applied))" = "p0 p2 p1" ] &&
     [ "$(echo $(stg unapplied))" = "" ]