author | Patrick Mezard <pmezard@gmail.com> |
Mon, 14 Apr 2008 22:31:33 +0200 | |
changeset 6537 | b6a24c273c30 |
parent 6336 | 4b0c9c674707 |
child 6518 | 92ccccb55ba3 |
permissions | -rw-r--r-- |
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