diff -r f89fd07fc51d -r e75aab656f46 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Thu Mar 06 22:23:26 2008 +0100
+++ b/mercurial/filemerge.py	Thu Mar 06 22:23:41 2008 +0100
@@ -7,7 +7,7 @@
 
 from node import nullrev
 from i18n import _
-import util, os, tempfile, context, simplemerge, re, filecmp
+import util, os, tempfile, simplemerge, re, filecmp
 
 def _toolstr(ui, tool, part, default=""):
     return ui.config("merge-tools", tool + "." + part, default)