/[emacs]/emacs/lisp/pcvs.el
ViewVC logotype

Diff of /emacs/lisp/pcvs.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.75 by monnier, Mon Feb 21 18:35:23 2005 UTC revision 1.76 by monnier, Mon Mar 14 19:39:17 2005 UTC
# Line 1704  Signal an error if there is no backup fi Line 1704  Signal an error if there is no backup fi
1704              (message "Retrieving revision %s... Done" rev)              (message "Retrieving revision %s... Done" rev)
1705              (current-buffer))))))              (current-buffer))))))
1706    
 (eval-and-compile (autoload 'smerge-ediff "smerge-mode"))  
   
1707  ;; FIXME: The user should be able to specify ancestor/head/backup and we should  ;; FIXME: The user should be able to specify ancestor/head/backup and we should
1708  ;; provide sensible defaults when merge info is unavailable (rather than rely  ;; provide sensible defaults when merge info is unavailable (rather than rely
1709  ;; on smerge-ediff).  Also provide sane defaults for need-merge files.  ;; on smerge-ediff).  Also provide sane defaults for need-merge files.

Legend:
Removed from v.1.75  
changed lines
  Added in v.1.76

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26