Mercurial Mercurial > mercurial / 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-update-renames.out
author Martin Geisler <mg@aragost.com>
Thu, 12 Aug 2010 18:10:26 +0200
changeset 11828 5a64302e5d3a
parent 10874 4f11978ae45d
permissions -rw-r--r--
i18n: merge with stable

merging a and b to b
warning: conflicts during merge.
merging b failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
mercurial