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-merge4.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sat, 25 Aug 2007 11:30:11 +0200
changeset 5224 9cd6578750b9
parent 2175 b2ae81a7df29
permissions -rw-r--r--
improve error message for 'hg merge' when repo already at branchtip

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
mercurial-crew-with-dirclash