tests/test-merge6.out
author TK Soh <teekaysoh@yahoo.com>
Sat, 27 Aug 2005 18:55:14 -0700
changeset 1113 6130de75bb2a
parent 1043 9344f5dd4488
child 2019 ced2d3620f95
permissions -rw-r--r--
Updated manpage and help. Updated manpage on change to hg status; standardized description of -print0 options.

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 update' to get a working copy)
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 update' to get a working copy)
bar should remain deleted.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo