author | Gregory Szorc <gregory.szorc@gmail.com> |
Sat, 08 Aug 2015 19:54:11 -0700 | |
changeset 25974 | 241a1324a180 |
parent 25973 | fb5664eb8414 |
child 25975 | de7a3893ee65 |
--- a/mercurial/simplemerge.py Sat Aug 08 19:53:25 2015 -0700 +++ b/mercurial/simplemerge.py Sat Aug 08 19:54:11 2015 -0700 @@ -16,9 +16,17 @@ # mbp: "you know that thing where cvs gives you conflict markers?" # s: "i hate that." -from i18n import _ -import scmutil, util, mdiff -import sys, os +from __future__ import absolute_import + +import os +import sys + +from .i18n import _ +from . import ( + mdiff, + scmutil, + util, +) class CantReprocessAndShowBase(Exception): pass