upstream/mercurial-mirror Files · mercurial/thirdparty/cbor/__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

Gregory Szorc - - Load All Authors

File last commit:

r37231:3bc609bc default


                r39001:cf68e264

default

Download file

             __init__.py
        
                    10 lines
            
             | 141 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / thirdparty / cbor / __init__.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from .cbor2 import (

          CBORDecodeError,

          CBORDecoder,

          CBOREncodeError,

          CBOREncoder,

          dump,

          dumps,

          load,

          loads,

      )

	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

				from .cbor2 import (
				CBORDecodeError,
				CBORDecoder,
				CBOREncodeError,
				CBOREncoder,
				dump,
				dumps,
				load,
				loads,
				)