author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
Mon, 31 Mar 2008 18:49:15 +0200 | |
changeset 6420 | 626a8e396846 |
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