test-merge6.out
18 lines
| 536 B
| text/plain
|
TextLexer
/ tests / test-merge6.out
maf46@burn.cl.cam.ac.uk
|
r616 | pulling from ../B1 | ||
| searching for changes | ||||
| adding changesets | ||||
| adding manifests | ||||
mpm@selenic.com
|
r775 | adding file changes | ||
|
mpm@selenic.com
|
r1043 | added 1 changesets with 1 changes to 1 files (+1 heads) | ||
|
maf46@burn.cl.cam.ac.uk
|
r616 | (run 'hg update' to get a working copy) | ||
| bar should remain deleted. | ||||
|
mpm@selenic.com
|
r993 | f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo | ||
|
maf46@burn.cl.cam.ac.uk
|
r616 | pulling from ../A2 | ||
| searching for changes | ||||
| adding changesets | ||||
| adding manifests | ||||
|
mpm@selenic.com
|
r775 | adding file changes | ||
|
mpm@selenic.com
|
r1043 | added 1 changesets with 0 changes to 0 files (+1 heads) | ||
|
maf46@burn.cl.cam.ac.uk
|
r616 | (run 'hg update' to get a working copy) | ||
| bar should remain deleted. | ||||
|
mpm@selenic.com
|
r990 | f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo | ||