Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8.out @ 3528:bf48ca46139b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgcommand.vim: remove deprecated -b option from hg parents.
author Christian Ebert <blacktrash@gmx.net>
date Wed, 25 Oct 2006 21:01:00 +0200
parents efbe24c7d8d9
children 9103dab96093
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)
merging a and b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved