equal
deleted
inserted
replaced
460 shelved as default |
460 shelved as default |
461 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
461 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
462 $ hg rebase -d 1 --config extensions.rebase= |
462 $ hg rebase -d 1 --config extensions.rebase= |
463 rebasing 2:323bfa07f744 "xyz" (tip) |
463 rebasing 2:323bfa07f744 "xyz" (tip) |
464 merging x |
464 merging x |
465 saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-backup.hg (glob) |
465 saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-backup.hg (glob) |
466 $ hg unshelve |
466 $ hg unshelve |
467 unshelving change 'default' |
467 unshelving change 'default' |
468 rebasing shelved changes |
468 rebasing shelved changes |
469 rebasing 4:b8fefe789ed0 "changes to 'xyz'" (tip) |
469 rebasing 4:b8fefe789ed0 "changes to 'xyz'" (tip) |
470 $ hg status |
470 $ hg status |