diff -r e0eb03bfa5af -r b87a50b7125c mercurial/simplemerge.py
--- 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