Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 4716:36d23de02da1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make earlygetopt return a list of all option values, use the last value. This fixes: "hg -R" showing a useful error instead of traceback "hg -R foo --repository bar" using bar instead of foo And provides a way for other users of earlygetopt to accept more than one value.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 25 Jun 2007 22:08:10 +0200
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