'
cat > expected.txt <<EOF
-? foo/bar.ancestor
-? foo/bar.current
-? foo/bar.patched
A fie
C foo/bar
EOF
test_expect_success 'Status after conflicting push' '
- ! stg push &&
+ conflict stg push &&
stg status > output.txt &&
test_cmp expected.txt output.txt
'
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
'