view mercurial/cext/base85.pyi @ 48713:5dfaca4464d1

merge-actions: add an explicite "no_op" attribute

This make the MergeAction smarter and able to describe themself. This is useful
to help introducing more MergeAction object that better the complexity of the
situation.

Differential Revision: https://phab.mercurial-scm.org/D12116

from typing import Optional

version: int

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