mercurial/filemerge.py
changeset 43089 c59eb1560c44
parent 43085 eef9a2d67051
child 43106 d783f945a701
equal deleted inserted replaced
43088:0d612db7047c 43089:c59eb1560c44
    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 from .pycompat import (
       
    22     getattr,
       
    23     open,
       
    24 )
    22 
    25 
    23 from . import (
    26 from . import (
    24     encoding,
    27     encoding,
    25     error,
    28     error,
    26     formatter,
    29     formatter,