Mercurial > hg
view tests/test-conflict.out @ 7541:11660d2918af
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 20 Dec 2008 16:27:51 -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