Mercurial > hg

view tests/test-conflict.out @ 5732:2060cad9fabd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bisect: simplify state handling and init - use a single bisect.state file - unify init and reset (delete the state) - move write into good/bad
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Dec 2007 23:55:39 -0600
parents 93a4e72b4f83
children 5af5f0f9d724
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