equal
deleted
inserted
replaced
483 U c2 |
483 U c2 |
484 |
484 |
485 $ hg resolve -m c2 |
485 $ hg resolve -m c2 |
486 (no more unresolved files) |
486 (no more unresolved files) |
487 $ hg rebase -c --tool internal:fail |
487 $ hg rebase -c --tool internal:fail |
488 tool option will be ignored |
|
489 rebasing 2:e4e3f3546619 "c2b" (tip) |
488 rebasing 2:e4e3f3546619 "c2b" (tip) |
490 note: rebase of 2:e4e3f3546619 created no changes to commit |
489 note: rebase of 2:e4e3f3546619 created no changes to commit |
491 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-backup.hg (glob) |
490 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-backup.hg (glob) |
492 |
491 |
493 $ hg rebase -i |
492 $ hg rebase -i |