changeset 16913 | f2719b387380 |
parent 16566 | ae6dddffe4f1 |
child 17005 | 50f434510da6 |
16912:6ef3107c661e | 16913:f2719b387380 |
---|---|
425 $ hg resolve -m c2 |
425 $ hg resolve -m c2 |
426 $ hg rebase -c --tool internal:fail |
426 $ hg rebase -c --tool internal:fail |
427 tool option will be ignored |
427 tool option will be ignored |
428 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/*-backup.hg (glob) |
428 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/*-backup.hg (glob) |
429 |
429 |
430 $ cd .. |