test-merge5.out
6 lines
| 252 B
| text/plain
|
TextLexer
/ tests / test-merge5.out
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r767 | removing b | ||
|
r415 | this update spans a branch affecting the following files: | ||
|
r616 | b | ||
|
r415 | aborting update spanning branches! | ||
|
r2038 | (use 'hg merge' to merge across branches or 'hg update -C' to lose changes) | ||