Mercurial > public > mercurial-scm > hg-stable

diff mercurial/simplemerge.py @ 8312:b87a50b7125c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
separate import lines from mercurial and general python modules
author Simon Heimberg <simohe@besonet.ch>
date Tue, 28 Apr 2009 17:40:46 +0200
parents bb9f13974d8e
children 08a0f04b56bd
line wrap: on
line diff
--- a/mercurial/simplemerge.py	Thu May 07 15:08:25 2009 +0300
+++ b/mercurial/simplemerge.py	Tue Apr 28 17:40:46 2009 +0200
@@ -19,7 +19,8 @@
 # s: "i hate that."
 
 from i18n import _
-import util, mdiff, sys, os
+import util, mdiff
+import sys, os
 
 class CantReprocessAndShowBase(Exception):
     pass