test-conflict.out
13 lines
| 367 B
| text/plain
|
TextLexer
/ tests / test-conflict.out
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r346 | merge: warning: conflicts during merge | ||
merging a | ||||
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 | ||
|
r346 | something else | ||
======= | ||||
something | ||||
|
r748 | M a | ||