Mercurial > hg
view tests/test-conflict.out @ 11681:c5e555e064d0
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 25 Jul 2010 21:20:05 -0500 |
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