| changeset 48875 | 6000f5b25c9b |
| parent 46819 | d4ba4d51f85f |
| child 51863 | f4733654f144 |
--- a/mercurial/mergeutil.py Sun Feb 20 15:18:15 2022 -0700 +++ b/mercurial/mergeutil.py Thu Mar 03 17:34:00 2022 +0100 @@ -5,7 +5,6 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -from __future__ import absolute_import from .i18n import _