Mercurial > hg

view tests/test-conflict.out @ 2702:133811a7688b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow tests that end in .py and .bat Revision 6ed46bad9530 disallowed tests that have a '.' in the name, but that also disallows tests that end in .py and .bat, even though run-tests.py has some code to special case them.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 21 Jul 2006 01:51:17 -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