X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/a138c01c81755bd2ac35f3d9726f73596292ab87..f02be96172f8cf36e052ff86678646b1991ed283:/t/t1205-push-subdir.sh?ds=sidebyside

diff --git a/t/t1205-push-subdir.sh b/t/t1205-push-subdir.sh
index 54a5b89..88b23c4 100755
--- a/t/t1205-push-subdir.sh
+++ b/t/t1205-push-subdir.sh
@@ -42,7 +42,7 @@ test_expect_success 'Modifying push from a subdir' '
     [ "$(echo $(cat foo/y.txt))" = "y0 y1 y2" ]
 '
 
-test_expect_success 'Conflicting push from subdir' '
+test_expect_failure 'Conflicting push from subdir' '
     stg pop p1 p2 &&
     [ "$(echo $(cat x.txt))" = "x0" ] &&
     [ "$(echo $(cat foo/y.txt))" = "y0" ] &&