Mercurial > hg > mercurial-crew

view tests/test-conflict.out @ 10384:832f35386067

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
import: import each patch in a file or stream as a separate change Supports hg export <revrange>, mail messages, and mailboxes. Does not support multiple patches in a single MIME attachment. Closes issue167.
author Brendan Cully <brendan@kublai.com>
date Sun, 07 Feb 2010 18:06:52 +0100
parents b2310903c462
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging a
warning: conflicts during merge.
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
e7fe8eb3e180+0d24b7662d3e+ tip
<<<<<<< local
something else
=======
something
>>>>>>> other
M a
? a.orig