tests/test-merge6.out
author mpm@selenic.com
Sat, 20 Aug 2005 01:46:57 -0700
changeset 972 0bc72d91aeda
parent 925 5a034646e472
child 990 5007e0bdeed2
permissions -rw-r--r--
Added tag 0.6c for changeset eac9c8efcd9bd8244e72fb6821f769f450457a32

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