equal
deleted
inserted
replaced
195 base: [3] added c |
195 base: [3] added c |
196 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
196 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
197 merge:[5] added d |
197 merge:[5] added d |
198 with: [7] added d |
198 with: [7] added d |
199 base: [4] added d |
199 base: [4] added d |
200 rebasing "divergent" content-divergent changeset e49523854bc8 on ddcf04e1458c |
200 rebasing "divergent" content-divergent changeset e49523854bc8 on 0194d1974f1a |
201 merging d |
201 merging d |
202 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
202 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
203 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
203 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
204 unresolved merge conflicts |
204 unresolved merge conflicts |
205 (see 'hg help evolve.interrupted') |
205 (see 'hg help evolve.interrupted') |