mercurial/merge.py
changeset 43090 1f339b503a40
parent 43077 687b865b95ad
child 43104 74802979dd9d
equal deleted inserted replaced
43089:c59eb1560c44 43090:1f339b503a40
    21     modifiednodeid,
    21     modifiednodeid,
    22     nullhex,
    22     nullhex,
    23     nullid,
    23     nullid,
    24     nullrev,
    24     nullrev,
    25 )
    25 )
       
    26 from .pycompat import delattr
    26 from .thirdparty import attr
    27 from .thirdparty import attr
    27 from . import (
    28 from . import (
    28     copies,
    29     copies,
    29     encoding,
    30     encoding,
    30     error,
    31     error,