Mercurial > hg

view tests/test-conflict.out @ 7432:642754e776e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rpm spec: include python egg in rpm Better complicance with packaging guidelines http://fedoraproject.org/wiki/Packaging/Python http://fedoraproject.org/wiki/Packaging/Python/Eggs
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 27 Nov 2008 01:10:27 +0100
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