tests/test-conflict.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 07 Apr 2007 04:27:55 -0300
changeset 4318 b95a42114616
parent 2175 b2ae81a7df29
child 4365 46280c004f22
permissions -rw-r--r--
run-tests.py: tell coverage.py to ignore errors Otherwise there'll be some IOErrors when it tries to open python files created during the execution of e.g. test-hook.

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