tests/test-merge6.out
author mpm@selenic.com
Tue, 16 Aug 2005 19:03:01 -0800
changeset 925 5a034646e472
parent 814 0902ffece4b4
child 990 5007e0bdeed2
permissions -rw-r--r--
run-tests: remove '+ hg' trick This was causing me a fair amount of debugging confusion. Let's just forget it entirely. Updated tests to match.

pulling from ../B1
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
bar should remain deleted.
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
pulling from ../A2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files
(run 'hg update' to get a working copy)
bar should remain deleted.
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo