tests/test-merge8.out
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 17 Jul 2007 09:39:30 -0700
changeset 4899 1b7bbc4349e7
parent 4416 bb1800a7d7e1
child 6338 0750f11152fe
permissions -rw-r--r--
patch.py: don't mark files as changed unless they have actually been changed

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