Mercurial > emacs

diff lisp/pcvs.el @ 60602:2dbd4bc756fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-ediff): Remove bogus autoload.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 14 Mar 2005 19:39:17 +0000
parents 3e86eb0e2e0b
children 7178fdb70eff 30ad2795fdab
line wrap: on
line diff
--- a/lisp/pcvs.el	Mon Mar 14 17:46:09 2005 +0000
+++ b/lisp/pcvs.el	Mon Mar 14 19:39:17 2005 +0000
@@ -1704,8 +1704,6 @@
 	    (message "Retrieving revision %s... Done" rev)
 	    (current-buffer))))))
 
-(eval-and-compile (autoload 'smerge-ediff "smerge-mode"))
-
 ;; FIXME: The user should be able to specify ancestor/head/backup and we should
 ;; provide sensible defaults when merge info is unavailable (rather than rely
 ;; on smerge-ediff).  Also provide sane defaults for need-merge files.