Mercurial > hg > gitweb

view tests/test-conflict.out @ 3078:baa3873eb387

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't let lazyparser read more data than it can handle This should fix issue368.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 10 Sep 2006 19:15:08 -0300
parents b2ae81a7df29
children 46280c004f22
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merge: 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
something else
=======
something
M a