Mercurial > hg

view tests/test-merge8.out @ 4014:509342f95564

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
various doc fixes - update can no longer be used to merge - short summary start with lowercase - add merge to short help list - fix tests
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 29 Dec 2006 06:37:43 +0100
parents 9103dab96093
children 4787e2b0dd03
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