--- a/mercurial/filemerge.py	Fri Mar 07 00:24:36 2008 +0100
+++ b/mercurial/filemerge.py	Thu Mar 06 22:23:26 2008 +0100
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from node import *
+from node import nullrev
 from i18n import _
 import util, os, tempfile, context, simplemerge, re, filecmp