equal
deleted
inserted
replaced
85 summary: Initial commit |
85 summary: Initial commit |
86 |
86 |
87 |
87 |
88 edit the history |
88 edit the history |
89 $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle |
89 $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle |
90 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
91 merging e |
90 merging e |
92 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
91 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
93 Fix up the change (pick 39522b764e3d) |
92 Fix up the change (pick 39522b764e3d) |
94 (hg histedit --continue to resume) |
93 (hg histedit --continue to resume) |
95 |
94 |
143 summary: Initial commit |
142 summary: Initial commit |
144 |
143 |
145 |
144 |
146 edit the history |
145 edit the history |
147 $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle |
146 $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle |
148 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
149 merging e |
147 merging e |
150 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
148 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
151 Fix up the change (pick 39522b764e3d) |
149 Fix up the change (pick 39522b764e3d) |
152 (hg histedit --continue to resume) |
150 (hg histedit --continue to resume) |
153 |
151 |
239 pick 7b4e2f4b7bcd 5 e |
237 pick 7b4e2f4b7bcd 5 e |
240 pick 500cac37a696 6 f |
238 pick 500cac37a696 6 f |
241 |
239 |
242 edit the history, this time with a fold action |
240 edit the history, this time with a fold action |
243 $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle |
241 $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle |
244 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
245 merging e |
242 merging e |
246 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
243 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
247 Fix up the change (mess 39522b764e3d) |
244 Fix up the change (mess 39522b764e3d) |
248 (hg histedit --continue to resume) |
245 (hg histedit --continue to resume) |
249 |
246 |