equal
deleted
inserted
replaced
7583 running interactively. So, this will bring up all the conflicts between |
7583 running interactively. So, this will bring up all the conflicts between |
7584 working directory and the shelve, irrespective of which changes will be |
7584 working directory and the shelve, irrespective of which changes will be |
7585 unshelved. |
7585 unshelved. |
7586 """ |
7586 """ |
7587 with repo.wlock(): |
7587 with repo.wlock(): |
7588 return shelvemod.dounshelve(ui, repo, *shelved, **opts) |
7588 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts) |
7589 |
7589 |
7590 |
7590 |
7591 statemod.addunfinished( |
7591 statemod.addunfinished( |
7592 b'unshelve', |
7592 b'unshelve', |
7593 fname=b'shelvedstate', |
7593 fname=b'shelvedstate', |