mercurial/merge.py

--- a/mercurial/merge.py	Fri Mar 07 00:24:36 2008 +0100
+++ b/mercurial/merge.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 nullid, nullrev
 from i18n import _
 import errno, util, os, heapq, filemerge