diff -r f680a1bd679b -r 4a4c7f6a5912 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Mon Mar 23 13:12:03 2009 +0100
+++ b/mercurial/filemerge.py	Mon Mar 23 13:12:07 2009 +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 nullrev, short
+from node import short
 from i18n import _
 import util, os, tempfile, simplemerge, re, filecmp