test-merge5.out
7 lines
| 277 B
| text/plain
|
TextLexer
/ tests / test-merge5.out
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r767 | removing b | ||
|
r6336 | created new head | ||
|
r6350 | % should abort | ||
|
r3592 | abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes | ||
|
r6350 | % should succeed | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||