mercurial/filemerge.py
changeset 43085 eef9a2d67051
parent 43077 687b865b95ad
child 43089 c59eb1560c44
equal deleted inserted replaced
43084:c2e284cee333 43085:eef9a2d67051
    16 from .node import (
    16 from .node import (
    17     hex,
    17     hex,
    18     nullid,
    18     nullid,
    19     short,
    19     short,
    20 )
    20 )
       
    21 from .pycompat import open
    21 
    22 
    22 from . import (
    23 from . import (
    23     encoding,
    24     encoding,
    24     error,
    25     error,
    25     formatter,
    26     formatter,