test-conflict.out
17 lines
| 415 B
| text/plain
|
TextLexer
/ tests / test-conflict.out
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r6336 | created new head | ||
|
r6004 | merging a | ||
|
r4365 | warning: conflicts during merge. | ||
|
r346 | merging a failed! | ||
|
r2175 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||
There are unresolved merges, you can redo the full merge using: | ||||
hg update -C 2 | ||||
hg merge 1 | ||||
|
r1933 | e7fe8eb3e180+0d24b7662d3e+ tip | ||
|
r6004 | <<<<<<< local | ||
|
r346 | something else | ||
======= | ||||
something | ||||
|
r4387 | >>>>>>> other | ||
|
r748 | M a | ||
|
r6004 | ? a.orig | ||