[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/pcvs.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/pcvs.el |
Date: |
Mon, 14 Mar 2005 14:39:19 -0500 |
Index: emacs/lisp/pcvs.el
diff -c emacs/lisp/pcvs.el:1.75 emacs/lisp/pcvs.el:1.76
*** emacs/lisp/pcvs.el:1.75 Mon Feb 21 18:35:23 2005
--- emacs/lisp/pcvs.el Mon Mar 14 19:39:17 2005
***************
*** 1704,1711 ****
(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.
--- 1704,1709 ----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/pcvs.el,
Stefan Monnier <=