stg new e0 -m e0 &&
stg new p0 -m p0 &&
echo foo > foo.txt &&
- git add foo.txt &&
+ stg add foo.txt &&
stg refresh &&
stg new e1 -m e1 &&
stg new e2 -m e2 &&
stg new p2 -m p2
echo quux > foo.txt &&
stg refresh &&
- conflict_old stg push
+ conflict stg push
'
test_expect_success 'Make sure conflicting patches are preserved' '