Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8.out @ 3570:c141d07198b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Inform the user about the new URL when being redirected via http. Additionally the changed code ensures that the new URL is used, even if it doesn't end with the query string.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 28 Oct 2006 23:05:57 +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