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 Brendan Cully <brendan@kublai.com>
Tue, 24 Apr 2007 18:43:18 -0700
changeset 4374 de612b5f8d59
parent 4311 4787e2b0dd03
child 4416 bb1800a7d7e1
permissions -rw-r--r--
Make copy --after work for files that have been hg added.

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