X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/b993d23f49af71ded6b0eaeb19ccf25b6bec4432..7c11b7547f2063327b1a3697df493ad0f707cea3:/t/t0002-status.sh diff --git a/t/t0002-status.sh b/t/t0002-status.sh index d95a83b..2512c53 100755 --- a/t/t0002-status.sh +++ b/t/t0002-status.sh @@ -111,7 +111,7 @@ A fie C foo/bar EOF test_expect_success 'Status after conflicting push' ' - conflict_old stg push && + conflict stg push && stg status > output.txt && test_cmp expected.txt output.txt ' @@ -145,7 +145,7 @@ A fie M foo/bar EOF test_expect_success 'Status after resolving the push' ' - stg resolved -a && + git add --update && stg status > output.txt && test_cmp expected.txt output.txt '