equal
deleted
inserted
replaced
452 |
452 |
453 $ hg resolve -l |
453 $ hg resolve -l |
454 U c2 |
454 U c2 |
455 |
455 |
456 $ hg resolve -m c2 |
456 $ hg resolve -m c2 |
|
457 no unresolved files; you may continue your unfinished operation |
457 $ hg rebase -c --tool internal:fail |
458 $ hg rebase -c --tool internal:fail |
458 tool option will be ignored |
459 tool option will be ignored |
459 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/*-backup.hg (glob) |
460 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/*-backup.hg (glob) |
460 |
461 |
461 $ cd .. |
462 $ cd .. |