Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8.out @ 4798:452d171a1b39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed calling the merge script and reporting errors in debuginstall (issue617)
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 04 Jul 2007 09:20:56 +0200
parents bb1800a7d7e1
children
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