Mercurial > hg

diff mercurial/merge.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 98acfd1d2b08
children 0bf0045000b5
line wrap: on
line diff
--- a/mercurial/merge.py	Thu May 07 15:08:25 2009 +0300
+++ b/mercurial/merge.py	Tue Apr 28 17:40:46 2009 +0200
@@ -7,7 +7,8 @@
 
 from node import nullid, nullrev, hex, bin
 from i18n import _
-import errno, util, os, filemerge, copies, shutil
+import util, filemerge, copies
+import errno, os, shutil
 
 class mergestate(object):
     '''track 3-way merge state of individual files'''