test-merge5.out
12 lines
| 320 B
| text/plain
|
TextLexer
/ tests / test-merge5.out
mpm@selenic.com
|
r415 | + hg init | ||
| + hg add a b | ||||
Thomas Arendsen Hein
|
r801 | + hg commit -m commit #0 -d 0 0 | ||
| + hg commit -mcomment #1 -d 0 0 | ||||
|
mpm@selenic.com
|
r415 | + hg update 0 | ||
|
Thomas Arendsen Hein
|
r801 | + hg commit -A -mcomment #2 -d 0 0 | ||
Bryan O'Sullivan
|
r767 | removing b | ||
|
mpm@selenic.com
|
r415 | + hg update 1 | ||
| this update spans a branch affecting the following files: | ||||
maf46@burn.cl.cam.ac.uk
|
r616 | b | ||
|
mpm@selenic.com
|
r415 | aborting update spanning branches! | ||
|
Bryan O'Sullivan
|
r819 | (use update -m to merge across branches or -C to lose changes) | ||