tests/test-merge6.out
author Matt Mackall <mpm@selenic.com>
Fri, 31 Mar 2006 03:25:35 -0600
changeset 2028 1f1fc418a96c
parent 2019 ced2d3620f95
child 2175 b2ae81a7df29
permissions -rw-r--r--
ssh: skip noise generated by remote shell we send a dummy command with known output to get in sync

pulling from ../B1
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
bar should remain deleted.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
pulling from ../A2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
bar should remain deleted.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo