tests/test-update-renames.out

subrepo: correctly handle update -C with modified subrepos (issue2022)

(based on a patch by Saint Germain)

merging a and b to b
warning: conflicts during merge.
merging b failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges