Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 6212:e75aab656f46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unused imports
author Joel Rosdahl <joel@rosdahl.net>
date Thu, 06 Mar 2008 22:23:41 +0100
parents f89fd07fc51d
children 368a4ec603cc 2b181fb3a70a
line wrap: on
line diff
--- 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)