equal
deleted
inserted
replaced
52 $ hg shelve |
52 $ hg shelve |
53 shelved as default |
53 shelved as default |
54 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
55 |
55 |
56 $ hg rebase -d 6c103be8f4e4 --config extensions.rebase= |
56 $ hg rebase -d 6c103be8f4e4 --config extensions.rebase= |
57 rebasing 2:323bfa07f744 "xyz"( \(tip\))? (re) |
57 rebasing 2:323bfa07f744( tip)? "xyz" (re) |
58 merging x |
58 merging x |
59 saved backup bundle to \$TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-(78114325|7ae538ef)-rebase.hg (re) |
59 saved backup bundle to \$TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-(78114325|7ae538ef)-rebase.hg (re) |
60 $ hg unshelve |
60 $ hg unshelve |
61 unshelving change 'default' |
61 unshelving change 'default' |
62 rebasing shelved changes |
62 rebasing shelved changes |