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-conflict.out
author Maxim Dounin <mdounin@mdounin.ru>
Wed, 13 Feb 2008 05:27:04 +0300
changeset 6085 e1f11b8a1e9e
parent 6004 5af5f0f9d724
child 6336 4b0c9c674707
permissions -rw-r--r--
hgweb: disable cgitb by default in hgwebdir.fcgi too

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging a
warning: conflicts during merge.
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
  hg update -C 2
  hg merge 1
e7fe8eb3e180+0d24b7662d3e+ tip
<<<<<<< local
something else
=======
something
>>>>>>> other
M a
? a.orig
Mercurial