X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/1eae3bf5ef8561508d83845f27b61c7533ba3378..fd52912d651e59701714b4b957757bca4725a728:/t/t3000-dirty-merge.sh

diff --git a/t/t3000-dirty-merge.sh b/t/t3000-dirty-merge.sh
index d87bba1..4dd6da3 100755
--- a/t/t3000-dirty-merge.sh
+++ b/t/t3000-dirty-merge.sh
@@ -26,7 +26,7 @@ test_expect_success 'Push with dirty worktree' '
     echo 4 > a &&
     [ "$(echo $(stg applied))" = "p1" ] &&
     [ "$(echo $(stg unapplied))" = "p2" ] &&
-    ! stg goto p2 &&
+    conflict stg goto p2 &&
     [ "$(echo $(stg applied))" = "p1" ] &&
     [ "$(echo $(stg unapplied))" = "p2" ] &&
     [ "$(echo $(cat a))" = "4" ]