diff options
Diffstat (limited to 'lisp/pcvs.el')
| -rw-r--r-- | lisp/pcvs.el | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lisp/pcvs.el b/lisp/pcvs.el index 2c0016dcc4..b00de07e50 100644 --- a/lisp/pcvs.el +++ b/lisp/pcvs.el @@ -1704,8 +1704,6 @@ Signal an error if there is no backup file." (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. |