Mercurial > hg

view tests/test-conflict.out @ 6327:6d952dc2abc9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: refactor granularity code, add a test - rename option dirstate.granularity - move option reading into .write() - add a simple test
author Matt Mackall <mpm@selenic.com>
date Thu, 20 Mar 2008 13:53:59 -0500
parents 5af5f0f9d724
children 4b0c9c674707
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging a
warning: conflicts during merge.
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
<<<<<<< local
something else
=======
something
>>>>>>> other
M a
? a.orig