stg new p2 -m p2
echo quux > foo.txt &&
stg refresh &&
- ! stg push
+ conflict_old stg push
'
-test_expect_failure 'Make sure conflicting patches are preserved' '
+test_expect_success 'Make sure conflicting patches are preserved' '
stg clean &&
[ "$(echo $(stg applied))" = "p0 p2 p1" ] &&
[ "$(echo $(stg unapplied))" = "" ]