Ask git about unmerged files

[stgit] / t / t1205-push-subdir.sh

diff --git a/t/t1205-push-subdir.sh b/t/t1205-push-subdir.sh
index 88b23c4d0f4caa6ef9e085c93d88f44d30ef4d67..54a5b896e199d8529e99fe994d30d5ee266e63f0 100755 (executable)
--- 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_failure 'Conflicting push from subdir' '
+test_expect_success 'Conflicting push from subdir' '
     stg pop p1 p2 &&
     [ "$(echo $(cat x.txt))" = "x0" ] &&
     [ "$(echo $(cat foo/y.txt))" = "y0" ] &&