Mercurial > hg-stable

view tests/test-conflict.out @ 7781:a45206455d85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keepalive: borrow code from newer httplib to patch ValueError (issue1088)
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Feb 2009 17:37:23 -0600
parents 92ccccb55ba3
children 9fe7e6acf525
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
e7fe8eb3e180+0d24b7662d3e+ tip
<<<<<<< local
something else
=======
something
>>>>>>> other
M a
? a.orig