changeset 48875 | 6000f5b25c9b |
parent 48758 | 7dad4665d223 |
child 48946 | 642e31cb55f0 |
--- a/mercurial/simplemerge.py Sun Feb 20 15:18:15 2022 -0700 +++ b/mercurial/simplemerge.py Thu Mar 03 17:34:00 2022 +0100 @@ -16,7 +16,6 @@ # mbp: "you know that thing where cvs gives you conflict markers?" # s: "i hate that." -from __future__ import absolute_import from .i18n import _ from . import (