##// END OF EJS Templates
graphlog: use '%' for other context in merge conflict...
graphlog: use '%' for other context in merge conflict This lets the user more easily find the commit that is involved in the conflict, such as the source of `hg update -m` or the commit being grafted by `hg graft`. Differential Revision: https://phab.mercurial-scm.org/D8043

File last commit:

r37144:4bd73a95 default
r44819:14d0e895 default
Show More
__init__.py
3 lines | 224 B | text/x-python | PythonLexer
from .decoder import load, loads, CBORDecoder, CBORDecodeError # noqa
from .encoder import dump, dumps, CBOREncoder, CBOREncodeError, shareable_encoder # noqa
from .types import CBORTag, CBORSimpleValue, undefined # noqa