equal
deleted
inserted
replaced
68 > pick bfa474341cc9 does not commute with e |
68 > pick bfa474341cc9 does not commute with e |
69 > pick e860deea161a e |
69 > pick e860deea161a e |
70 > pick 652413bf663e f |
70 > pick 652413bf663e f |
71 > EOF |
71 > EOF |
72 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
72 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
73 remote changed e which local deleted |
|
74 use (c)hanged version or leave (d)eleted? c |
|
75 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
73 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
76 merging e |
74 merging e |
77 warning: conflicts during merge. |
75 warning: conflicts during merge. |
78 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
76 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
79 Fix up the change and run hg histedit --continue |
77 Fix up the change and run hg histedit --continue |