Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8.out @ 3610:44cd1eb72fd7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: introduce a new capability for sending a compressed bundle the header of the bundle is the same as a on-disk bundle HG10UN: uncompressed HG10BZ: bz2 HG10GZ: gzip no header means uncompressed (old client)
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 01 Nov 2006 22:06:24 +0100
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