Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 2444:5eb02f9ed804

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update keepalive.py to current CVS version of urlgrabber. This fixes a bug where the output of test-bad-pull would differ between python 2.3 and 2.4. Also update the expected output of this test.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 16 Jun 2006 10:00:37 -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