equal
deleted
inserted
replaced
73 base: [4] added d |
73 base: [4] added d |
74 merging "other" content-divergent changeset 'e49523854bc8' |
74 merging "other" content-divergent changeset 'e49523854bc8' |
75 merging d |
75 merging d |
76 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
76 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
77 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
77 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
78 abort: fix conflicts and see `hg help evolve.interrupted` |
78 fix conflicts and see `hg help evolve.interrupted` |
79 [255] |
79 [1] |
80 |
80 |
81 $ hg evolve --stop |
81 $ hg evolve --stop |
82 stopped the interrupted evolve |
82 stopped the interrupted evolve |
83 working directory is now at 9c1631e352d9 |
83 working directory is now at 9c1631e352d9 |
84 |
84 |
127 updating to "local" side of the conflict: e49523854bc8 |
127 updating to "local" side of the conflict: e49523854bc8 |
128 merging "other" content-divergent changeset '606ad96040fc' |
128 merging "other" content-divergent changeset '606ad96040fc' |
129 merging d |
129 merging d |
130 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
130 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
131 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
131 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
132 abort: fix conflicts and see `hg help evolve.interrupted` |
132 fix conflicts and see `hg help evolve.interrupted` |
133 [255] |
133 [1] |
134 |
134 |
135 $ hg evolve --stop |
135 $ hg evolve --stop |
136 stopped the interrupted evolve |
136 stopped the interrupted evolve |
137 working directory is now at 517d4375cb72 |
137 working directory is now at 517d4375cb72 |
138 |
138 |