Mercurial > hg

view tests/test-conflict.out @ 6103:e668fd796b8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Propagating changes back to working dirs when changing files in external
author Fabio Zadrozny <fabiofz at gmail dot com>
date Sun, 26 Aug 2007 21:31:18 -0300
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