Mercurial Mercurial > hg-stable / 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 Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 11 Jul 2007 17:40:41 -0300
changeset 4829 0403b80352c9
parent 4387 93a4e72b4f83
child 6004 5af5f0f9d724
permissions -rw-r--r--
localrepo.wwrite: use opener.symlink This makes us fall back to regular files if symlinks are not supported.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
warning: conflicts during merge.
merging a
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
<<<<<<< my
something else
=======
something
>>>>>>> other
M a
hg-stable