equal
deleted
inserted
replaced
291 > fold 251d831eeec5 3 +6 |
291 > fold 251d831eeec5 3 +6 |
292 > EOF |
292 > EOF |
293 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
293 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
294 merging file |
294 merging file |
295 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
295 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
296 Fix up the change and run hg histedit --continue |
296 Fix up the change (fold 251d831eeec5) |
|
297 (hg histedit --continue to resume) |
297 [1] |
298 [1] |
298 There were conflicts, we keep P1 content. This |
299 There were conflicts, we keep P1 content. This |
299 should effectively drop the changes from +6. |
300 should effectively drop the changes from +6. |
300 $ hg status |
301 $ hg status |
301 M file |
302 M file |
352 > fold 251d831eeec5 3 +6 |
353 > fold 251d831eeec5 3 +6 |
353 > EOF |
354 > EOF |
354 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
355 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
355 merging file |
356 merging file |
356 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
357 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
357 Fix up the change and run hg histedit --continue |
358 Fix up the change (fold 251d831eeec5) |
|
359 (hg histedit --continue to resume) |
358 [1] |
360 [1] |
359 $ cat > file << EOF |
361 $ cat > file << EOF |
360 > 1 |
362 > 1 |
361 > 2 |
363 > 2 |
362 > 3 |
364 > 3 |