Mercurial > hg

diff mercurial/filemerge.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 744d6322b05b
line wrap: on
line diff
--- a/mercurial/filemerge.py	Thu May 07 15:08:25 2009 +0300
+++ b/mercurial/filemerge.py	Tue Apr 28 17:40:46 2009 +0200
@@ -7,7 +7,8 @@
 
 from node import short
 from i18n import _
-import util, os, tempfile, simplemerge, re, filecmp
+import util, simplemerge
+import os, tempfile, re, filecmp
 
 def _toolstr(ui, tool, part, default=""):
     return ui.config("merge-tools", tool + "." + part, default)