test-merge9.out
37 lines
| 725 B
| text/plain
|
TextLexer
/ tests / test-merge9.out
Alexis S. L. Carvalho
|
r4682 | adding bar | ||
| adding foo | ||||
| adding quux1 | ||||
| adding quux2 | ||||
Dirkjan Ochtman
|
r6336 | created new head | ||
|
Alexis S. L. Carvalho
|
r4682 | merging bar | ||
| merging bar failed! | ||||
Matt Mackall
|
r6512 | merging foo and baz to baz | ||
|
Matt Mackall
|
r6004 | 1 files updated, 1 files merged, 0 files removed, 1 files unresolved | ||
|
Matt Mackall
|
r6518 | use 'hg resolve' to retry unresolved file merges | ||
| U bar | ||||
| R baz | ||||
|
Alexis S. L. Carvalho
|
r4682 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
| merging bar | ||||
| merging bar failed! | ||||
|
Matt Mackall
|
r6512 | merging baz and foo to baz | ||
|
Matt Mackall
|
r6004 | 1 files updated, 1 files merged, 0 files removed, 1 files unresolved | ||
|
Matt Mackall
|
r6518 | use 'hg resolve' to retry unresolved file merges | ||
| % show unresolved | ||||
| U bar | ||||
| R baz | ||||
| % unmark baz | ||||
| % show | ||||
| U bar | ||||
| U baz | ||||
| % re-resolve baz | ||||
| merging baz and foo to baz | ||||
| % after | ||||
| U bar | ||||
| R baz | ||||
| % resolve all | ||||
| merging bar | ||||
| warning: conflicts during merge. | ||||
| merging bar failed! | ||||
| % after | ||||
| U bar | ||||
| R baz | ||||