Mercurial > public > mercurial-scm > hg-stable

diff mercurial/simplemerge.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 abd66eb0889e
children 810ca383da9c
line wrap: on
line diff
--- a/mercurial/simplemerge.py	Thu Mar 06 22:23:26 2008 +0100
+++ b/mercurial/simplemerge.py	Thu Mar 06 22:23:41 2008 +0100
@@ -19,7 +19,7 @@
 # s: "i hate that."
 
 from i18n import _
-import util, mdiff, fancyopts, sys, os
+import util, mdiff, sys, os
 
 class CantReprocessAndShowBase(Exception):
     pass