equal
deleted
inserted
replaced
974 $ hg commit -m 8bar |
974 $ hg commit -m 8bar |
975 created new head |
975 created new head |
976 $ hg merge |
976 $ hg merge |
977 merging m |
977 merging m |
978 warning: conflicts during merge. |
978 warning: conflicts during merge. |
979 merging m failed! |
979 merging m incomplete! (edit conflicts, then use 'hg resolve --mark') |
980 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
980 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
981 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
981 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
982 [1] |
982 [1] |
983 $ cat m |
983 $ cat m |
984 $Id$ |
984 $Id$ |