##// END OF EJS Templates
simplemerge: use absolute_import
Gregory Szorc -
r25974:241a1324 default
parent child Browse files
Show More
@@ -16,9 +16,17 b''
16 # mbp: "you know that thing where cvs gives you conflict markers?"
16 # mbp: "you know that thing where cvs gives you conflict markers?"
17 # s: "i hate that."
17 # s: "i hate that."
18
18
19 from i18n import _
19 from __future__ import absolute_import
20 import scmutil, util, mdiff
20
21 import sys, os
21 import os
22 import sys
23
24 from .i18n import _
25 from . import (
26 mdiff,
27 scmutil,
28 util,
29 )
22
30
23 class CantReprocessAndShowBase(Exception):
31 class CantReprocessAndShowBase(Exception):
24 pass
32 pass
General Comments 0
You need to be logged in to leave comments. Login now