Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge8.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 18 Oct 2006 10:35:14 +0200
changeset 3451 196baf20232b
parent 3389 efbe24c7d8d9
child 3674 9103dab96093
permissions -rw-r--r--
Add test for invalid branch cache (fixed by 27ebe4efe98e)

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
mercurial-crew-with-dirclash