equal
deleted
inserted
replaced
456 created new head |
456 created new head |
457 merging m |
457 merging m |
458 warning: conflicts during merge. |
458 warning: conflicts during merge. |
459 merging m failed! |
459 merging m failed! |
460 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
460 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
461 use 'hg resolve' to retry unresolved file merges |
461 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
462 % keyword stays outside conflict zone |
462 % keyword stays outside conflict zone |
463 $Id$ |
463 $Id$ |
464 <<<<<<< local |
464 <<<<<<< local |
465 bar |
465 bar |
466 ======= |
466 ======= |