Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 4078:ff08cebcd116

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg serve: call setconfig on the parentui It makes sense to do this on the "global" ui object, since command line options should affect the whole process. This should fix hg serve --style=gitweb inside a repo (part of issue253).
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 13 Feb 2007 10:00:17 -0200
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