X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/f749e393e47687971777d79c043562a91e4f493d..f249607484ed865696bd96a2055468b98b4e319f:/t/t0002-status.sh diff --git a/t/t0002-status.sh b/t/t0002-status.sh index 86ff419..ac92aa8 100755 --- a/t/t0002-status.sh +++ b/t/t0002-status.sh @@ -114,7 +114,7 @@ A fie C foo/bar EOF test_expect_success 'Status after conflicting push' ' - ! stg push && + conflict_old stg push && stg status > output.txt && test_cmp expected.txt output.txt '