Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 4703:bc63247c66e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: improve shortlog formatting shorten author with |person don't shrink font (default font is presumed to be preferred reading size) set widths based on font ems rather than page percents.
author Matt Mackall <mpm@selenic.com>
date Mon, 25 Jun 2007 11:30:05 -0500
parents 93a4e72b4f83
children
line wrap: on
line source

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