| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
| Thu, 21 Feb 2008 15:56:35 +0100 | |
| changeset 6155 | ea161d648117 |
| parent 6004 | 5af5f0f9d724 |
| child 6336 | 4b0c9c674707 |
| permissions | -rw-r--r-- |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 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