tests/test-conflict.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 17 Aug 2007 22:43:38 -0300
changeset 5194 1843098e665a
parent 4385 93a4e72b4f83
permissions -rw-r--r--
run-tests.py: pass --install-scripts to setup.py This avoids possible problems when the user has a ~/.pydistutils.cfg. Fixes issue638. Patch provided by Ralf Schmitt.

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