equal
deleted
inserted
replaced
95 $ hg ci -m 2 |
95 $ hg ci -m 2 |
96 created new head |
96 created new head |
97 |
97 |
98 $ hg merge |
98 $ hg merge |
99 merging a |
99 merging a |
100 warning: conflicts during merge. |
100 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
101 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
102 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
101 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
103 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
102 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
104 [1] |
103 [1] |
105 $ hg st |
104 $ hg st |
106 M a |
105 M a |