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 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
74 merging e |
73 merging e |
75 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
74 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
76 Fix up the change and run hg histedit --continue |
75 Fix up the change and run hg histedit --continue |
77 |
76 |
78 insert unsupported advisory merge record |
77 insert unsupported advisory merge record |