Mercurial > hg

view tests/test-conflict.out @ 8347:a3826fff1e87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util.termwidth: a file-like object may legitimately lack a fileno() method Spotted in the wild when running a hook while pushing over HTTPS.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 11 May 2009 11:53:27 -0700
parents 9fe7e6acf525
children b2310903c462
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 up --clean' to abandon
e7fe8eb3e180+0d24b7662d3e+ tip
<<<<<<< local
something else
=======
something
>>>>>>> other
M a
? a.orig