Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/simplemerge.py
changeset 6212 e75aab656f46
parent 6002 abd66eb0889e
child 7280 810ca383da9c 
--- 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
mercurial