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

merge: remove no longer required ACTION_GET_OTHER_AND_STORE...

merge: remove no longer required ACTION_GET_OTHER_AND_STORE In I (ab)used merge actions to pass info from manifestmerge() to applyupdates() and store info in mergestate. In previous patches, we introduced a separate return value from manifestmerge() and calculateupdates() and an argument to applyupdates() which achieved the same thing. Let's remove this no longer required messy code. Differential Revision: https://phab.mercurial-scm.org/D8744

Matt Harbison - - Load All Authors

File last commit:

r44031:2e017696 default


                r45834:c515c54f

default

Download file

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

/ mercurial / helptext / 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