test-merge5.out
12 lines
| 299 B
| text/plain
|
TextLexer
/ tests / test-merge5.out
|
r415 | + hg init | ||
+ hg add a b | ||||
|
r801 | + hg commit -m commit #0 -d 0 0 | ||
+ hg commit -mcomment #1 -d 0 0 | ||||
|
r415 | + hg update 0 | ||
|
r801 | + hg commit -A -mcomment #2 -d 0 0 | ||
|
r767 | removing b | ||
|
r415 | + hg update 1 | ||
this update spans a branch affecting the following files: | ||||
|
r616 | b | ||
|
r415 | aborting update spanning branches! | ||
(use update -m to perform a branch merge) | ||||