test-merge6.out
25 lines
| 985 B
| text/plain
|
TextLexer
/ tests / test-merge6.out
Thomas Arendsen Hein
|
r2175 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
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) | ||
Vadim Gelfer
|
r2019 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
|
Thomas Arendsen Hein
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
| (branch merge, don't forget to commit) | ||||
|
maf46@burn.cl.cam.ac.uk
|
r616 | bar should remain deleted. | ||
Patrick Mezard
|
r5405 | 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) | ||
|
Vadim Gelfer
|
r2019 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
|
Thomas Arendsen Hein
|
r2175 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
| (branch merge, don't forget to commit) | ||||
|
maf46@burn.cl.cam.ac.uk
|
r616 | bar should remain deleted. | ||
|
Patrick Mezard
|
r5405 | f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo | ||