equal
deleted
inserted
replaced
815 $ hg merge |
815 $ hg merge |
816 merging m |
816 merging m |
817 warning: conflicts during merge. |
817 warning: conflicts during merge. |
818 merging m failed! |
818 merging m failed! |
819 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
819 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
820 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
820 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
821 $ cat m |
821 $ cat m |
822 $Id$ |
822 $Id$ |
823 <<<<<<< local |
823 <<<<<<< local |
824 bar |
824 bar |
825 ======= |
825 ======= |