tests/test-merge8.out
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 08 May 2007 11:51:25 -0700
changeset 4419 59ddd43f609f
parent 4416 bb1800a7d7e1
permissions -rw-r--r--
contrib/hgsh: Check for .hg/store as well as .hg/data. This is required by the new repository layout.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved