mercurial/obsutil.py
changeset 38588 1c93e0237a24
parent 38587 b62000a28812
child 38706 83d965803325
equal deleted inserted replaced
38587:b62000a28812 38588:1c93e0237a24
     9 
     9 
    10 import re
    10 import re
    11 
    11 
    12 from .i18n import _
    12 from .i18n import _
    13 from . import (
    13 from . import (
       
    14     diffutil,
    14     node as nodemod,
    15     node as nodemod,
    15     phases,
    16     phases,
    16     util,
    17     util,
    17 )
    18 )
    18 from .utils import (
    19 from .utils import (
    19     dateutil,
    20     dateutil,
    20     diffutil,
       
    21 )
    21 )
    22 
    22 
    23 ### obsolescence marker flag
    23 ### obsolescence marker flag
    24 
    24 
    25 ## bumpedfix flag
    25 ## bumpedfix flag