view tests/test-merge8.out @ 4897:4574925db5c0

Add Chris Mason's mpatch library. The original repo is http://oss.oracle.com/mercurial/mason/mpatch
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 17 Jul 2007 09:39:30 -0700
parents bb1800a7d7e1
children 0750f11152fe
line wrap: on
line source

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