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 Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 30 Jan 2007 19:09:08 -0200
changeset 4058 e7282dede8cd
parent 3674 9103dab96093
child 4311 4787e2b0dd03
permissions -rw-r--r--
filecommit: don't forget the local parent on a merge with a local rename

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