diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -6210,6 +6210,12 @@ Timestamp in seconds is used to decide order of backups. More than ``maxbackups`` backups are kept, if same timestamp prevents from deciding exact order of them, for safety. + + Selected changes can be unshelved with ``--interactive`` flag. + The working directory is updated with the selected changes, and + only the unselected changes remain shelved. Note that the user will + get into conflicts whenever the shelved change has conflicts with + the working directory regardless of the changes requested by the user. """ with repo.wlock(): return shelvemod.dounshelve(ui, repo, *shelved, **opts)