upstream/mercurial-mirror Files · hgext3rd/__init__.py

status: advertise --abort instead of 'update -C .' to abort a merge...

status: advertise --abort instead of 'update -C .' to abort a merge status has a part where it shows the conflict information and how to continue or abort. Couple of release ago, we got merge --abort and we should advertise that instead of 'hg update -C .' which is kind of ugly. I know we need to unify the logic here. Differential Revision: https://phab.mercurial-scm.org/D4168

Pierre-Yves David - - Load All Authors

File last commit:

r28541:4b81487a default


                r39001:cf68e264

default

Download file

             __init__.py
        
                    4 lines
            
             | 157 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext3rd / __init__.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # name space package to host third party extensions

      from __future__ import absolute_import

      import pkgutil

      __path__ = pkgutil.extend_path(__path__, __name__)

	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

				# name space package to host third party extensions
				from __future__ import absolute_import
				import pkgutil
				__path__ = pkgutil.extend_path(__path__, __name__)