equal
deleted
inserted
replaced
76 base: [4] added d |
76 base: [4] added d |
77 merging "other" content-divergent changeset 'e49523854bc8' |
77 merging "other" content-divergent changeset 'e49523854bc8' |
78 merging d |
78 merging d |
79 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
79 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
80 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
80 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
81 abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort |
81 abort: fix conflicts and see `hg help evolve.interrupted` |
82 [255] |
82 [255] |
83 |
83 |
84 $ hg status -v |
84 $ hg status -v |
85 M d |
85 M d |
86 # The repository is in an unfinished *evolve* state. |
86 # The repository is in an unfinished *evolve* state. |
176 updating to "local" side of the conflict: e49523854bc8 |
176 updating to "local" side of the conflict: e49523854bc8 |
177 merging "other" content-divergent changeset 'f0f1694f123e' |
177 merging "other" content-divergent changeset 'f0f1694f123e' |
178 merging d |
178 merging d |
179 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
179 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
180 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
180 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
181 abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort |
181 abort: fix conflicts and see `hg help evolve.interrupted` |
182 [255] |
182 [255] |
183 |
183 |
184 $ hg evolve --abort |
184 $ hg evolve --abort |
185 evolve aborted |
185 evolve aborted |
186 working directory is now at 491e10505bae |
186 working directory is now at 491e10505bae |
336 updating to "local" side of the conflict: e49523854bc8 |
336 updating to "local" side of the conflict: e49523854bc8 |
337 merging "other" content-divergent changeset 'a663d1567f0b' |
337 merging "other" content-divergent changeset 'a663d1567f0b' |
338 merging d |
338 merging d |
339 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
339 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
340 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
340 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
341 abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort |
341 abort: fix conflicts and see `hg help evolve.interrupted` |
342 [255] |
342 [255] |
343 |
343 |
344 $ hg evolve --abort |
344 $ hg evolve --abort |
345 evolve aborted |
345 evolve aborted |
346 working directory is now at 33e4442acf98 |
346 working directory is now at 33e4442acf98 |