tests/test-conflict.out
author Frank Kingswood <frank@kingswood-consulting.co.uk>
Mon, 24 Jul 2006 23:06:05 -0700
changeset 2666 ebf033bc8eb2
parent 2175 b2ae81a7df29
child 4365 46280c004f22
permissions -rw-r--r--
hgweb: Configurable zebra stripes With this change, you can set [web] stripes=3 to get stripes every three lines (a-la fanfold paper), instead of every line on source and directory listings. The default behaviour is stripes=1 which generates output similar to current, and you can also turn stripes off by setting it to 0.

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