upstream/mercurial-mirror Files · mercurial/cext/base85.pyi

simplemerge: make merge_lines() a free function...

simplemerge: make merge_lines() a free function IMO, the rendering of a conflict as text with merge markers should be separate from the code for resolving conflicts. The latter is what `Merge3Text` is mostly about already. Differential Revision: https://phab.mercurial-scm.org/D11974

Gregory Szorc - - Load All Authors

File last commit:

r46652:8dca9051 default


                r49406:c6649c53

default

Download file

             base85.pyi
        
                    6 lines
            
             | 145 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / cext / base85.pyi
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from typing import Optional

      version: int

      def b85encode(text: bytes, pad: Optional[int]) -> bytes: ...

      def b85decode(text: bytes) -> bytes: ...

	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 typing import Optional

				version: int

				def b85encode(text: bytes, pad: Optional[int]) -> bytes: ...
				def b85decode(text: bytes) -> bytes: ...