equal
deleted
inserted
replaced
1068 $ echo bar >> m |
1068 $ echo bar >> m |
1069 $ hg commit -m 8bar |
1069 $ hg commit -m 8bar |
1070 created new head |
1070 created new head |
1071 $ hg merge |
1071 $ hg merge |
1072 merging m |
1072 merging m |
1073 warning: conflicts during merge. |
1073 warning: conflicts while merging m! (edit, then use 'hg resolve --mark') |
1074 merging m incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
1075 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
1074 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
1076 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
1075 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
1077 [1] |
1076 [1] |
1078 $ cat m |
1077 $ cat m |
1079 $Id$ |
1078 $Id$ |