equal
deleted
inserted
replaced
289 > EOF |
289 > EOF |
290 merging file |
290 merging file |
291 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
291 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
292 Fix up the change (fold 251d831eeec5) |
292 Fix up the change (fold 251d831eeec5) |
293 (hg histedit --continue to resume) |
293 (hg histedit --continue to resume) |
294 [1] |
294 [240] |
295 There were conflicts, we keep P1 content. This |
295 There were conflicts, we keep P1 content. This |
296 should effectively drop the changes from +6. |
296 should effectively drop the changes from +6. |
297 |
297 |
298 $ hg status -v |
298 $ hg status -v |
299 M file |
299 M file |
362 > EOF |
362 > EOF |
363 merging file |
363 merging file |
364 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
364 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
365 Fix up the change (fold 251d831eeec5) |
365 Fix up the change (fold 251d831eeec5) |
366 (hg histedit --continue to resume) |
366 (hg histedit --continue to resume) |
367 [1] |
367 [240] |
368 $ cat > file << EOF |
368 $ cat > file << EOF |
369 > 1 |
369 > 1 |
370 > 2 |
370 > 2 |
371 > 3 |
371 > 3 |
372 > 4 |
372 > 4 |