upstream/mercurial-mirror Files · mercurial/help/common.txt

shelve: make --keep option survive user intervention (issue5431)...

shelve: make --keep option survive user intervention (issue5431) Currently if user runs 'hg unshelve --keep' and merge conflicts occur, the information about --keep provided by user is lost and shelf is deleted after 'hg unshelve --continue'. This is obviously not desired, so this patch fixes it.

Takumi IINO - - Load All Authors

File last commit:

r19426:e4318468 default


                r30522:7b3136bc

default

Download file

             common.txt
        
                    8 lines
            
             | 240 B
            
                | text/plain
            
             |
                TextLexer

/ mercurial / help / common.txt

History | Annotation | Raw |Copy content |Copy permalink

				.. Common link and substitution definitions.

				.. \|hg(1)\| replace:: hg\ (1)
				.. _hg(1): hg.1.html
				.. \|hgrc(5)\| replace:: hgrc\ (5)
				.. _hgrc(5): hgrc.5.html
				.. \|hgignore(5)\| replace:: hgignore\ (5)
				.. _hgignore(5): hgignore.5.html

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages