Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8.out @ 3615:1d2fdea875bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed directory name having an extra dot on "hg archive -t tbz2 foo.tbz2". Problem reported by Rob Landley.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 02 Nov 2006 19:23:55 +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