Show
Ignore:
Timestamp:
10/02/05 09:47:43 (3 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/ediff-mult.el

    r3809 r3894  
    13151315             (or (file-exists-p otherfile) 
    13161316                 (if (y-or-n-p 
    1317                       (format "Copy %s to %s ? " file-abs otherfile)) 
     1317                      (format "Copy %s to %s? " file-abs otherfile)) 
    13181318                     (let* ((file-diff-record (assoc file-tail dir-diff-list)) 
    13191319                            (new-mem-code