equal
deleted
inserted
replaced
394 created new head |
394 created new head |
395 merging m |
395 merging m |
396 warning: conflicts during merge. |
396 warning: conflicts during merge. |
397 merging m failed! |
397 merging m failed! |
398 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
398 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
399 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
399 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
400 % keyword stays outside conflict zone |
400 % keyword stays outside conflict zone |
401 $Id$ |
401 $Id$ |
402 <<<<<<< local |
402 <<<<<<< local |
403 bar |
403 bar |
404 ======= |
404 ======= |