Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge6.out @ 1002:254ab35709e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with MPM.
author bos@eng-25.internal.keyresearch.com
date Mon, 22 Aug 2005 13:06:43 -0700
parents 5007e0bdeed2
children 6f274afc05c7
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.
f405ac83a5611071d6b54dd5eb26943b1fdc4460 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