test-update-renames.out
5 lines
| 190 B
| text/plain
|
TextLexer
/ tests / test-update-renames.out
Henrik Stuart
|
r10874 | 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 | ||||