Mercurial > hg

view tests/test-merge6.out @ 1033:5426c8248df6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with MPM.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 24 Aug 2005 12:50:11 -0700
parents 6f274afc05c7
children 9344f5dd4488
line wrap: on
line source

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.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 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.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo