'Rewind/rewrite upstream commit and pull it from clone, without --merged' \
'
(cd upstream && echo b >> file2 && stg refresh) &&
- (cd clone && ! stg pull)
+ (cd clone && conflict_old stg pull)
'
test_expect_success \
'"Solve" the conflict (pretend there is none)' \
'(cd clone &&
- git add file2 && EDITOR=cat git commit)'
+ stg add file2 && EDITOR=cat git commit)'
test_expect_success \
'Push the stack back' \