| author | Patrick Mezard <pmezard@gmail.com> |
| Wed, 03 Oct 2007 21:08:37 +0200 | |
| changeset 5365 | ac2ccdcf4539 |
| parent 4387 | 93a4e72b4f83 |
| child 6004 | 5af5f0f9d724 |
| 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