equal
deleted
inserted
replaced
77 use (c)hanged version or leave (d)eleted? c |
77 use (c)hanged version or leave (d)eleted? c |
78 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
78 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
79 merging e |
79 merging e |
80 warning: conflicts during merge. |
80 warning: conflicts during merge. |
81 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
81 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
82 abort: Fix up the change and run hg histedit --continue |
82 Fix up the change and run hg histedit --continue |
83 |
83 |
84 |
84 |
85 abort the edit |
85 abort the edit |
86 $ hg histedit --abort 2>&1 | fixbundle |
86 $ hg histedit --abort 2>&1 | fixbundle |
87 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
87 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |