##// END OF EJS Templates
patch: move mercurial-specific imports after stdlib imports
Augie Fackler -
r10965:7faef79a default
parent child Browse files
Show More
@@ -6,11 +6,12 b''
6 # This software may be used and distributed according to the terms of the
6 # This software may be used and distributed according to the terms of the
7 # GNU General Public License version 2 or any later version.
7 # GNU General Public License version 2 or any later version.
8
8
9 import cStringIO, email.Parser, os, re
10 import tempfile, zlib
11
9 from i18n import _
12 from i18n import _
10 from node import hex, nullid, short
13 from node import hex, nullid, short
11 import base85, cmdutil, mdiff, util, diffhelpers, copies
14 import base85, cmdutil, mdiff, util, diffhelpers, copies
12 import cStringIO, email.Parser, os, re
13 import tempfile, zlib
14
15
15 gitre = re.compile('diff --git a/(.*) b/(.*)')
16 gitre = re.compile('diff --git a/(.*) b/(.*)')
16
17
General Comments 0
You need to be logged in to leave comments. Login now