Mercurial > hg
view tests/test-conflict.out @ 6869:b49e01863202
Make test-hardlinks-safety repeatable and executable
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 08 Aug 2008 18:48:26 +0200 |
parents | 4b0c9c674707 |
children | 92ccccb55ba3 |
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 There are unresolved merges, you can redo the full merge using: hg update -C 2 hg merge 1 e7fe8eb3e180+0d24b7662d3e+ tip <<<<<<< local something else ======= something >>>>>>> other M a ? a.orig