Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 4895:fa6c9381d053

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: manually set encoding to UTF-8 Right now the backends assume we're working in UTF-8 and there's no good way to ignore the encoding when adding revisions.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 17 Jul 2007 09:08:29 -0300
parents 93a4e72b4f83
children
line wrap: on
line source

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