Mercurial Mercurial > hg / 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 Matt Mackall <mpm@selenic.com>
Fri, 20 Aug 2010 21:28:14 -0500
changeset 12007 652f71b235bf
parent 10874 4f11978ae45d
permissions -rw-r--r--
bisect: add test for unrelated starting revisions

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