author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
Mon, 25 Jun 2007 11:29:17 -0700 | |
changeset 4714 | a741293793f6 |
parent 4385 | 93a4e72b4f83 |
permissions | -rw-r--r-- |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved warning: conflicts during merge. merging a 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 <<<<<<< my something else ======= something >>>>>>> other M a