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.el

    r3809 r3894  
    88;; Keywords: comparing, merging, patching, tools, unix 
    99 
    10 (defconst ediff-version "2.80" "The current version of Ediff") 
    11 (defconst ediff-date "July 8, 2005" "Date of last update") 
     10(defconst ediff-version "2.80.1" "The current version of Ediff") 
     11(defconst ediff-date "September 19, 2005" "Date of last update") 
    1212 
    1313 
    …… 
    12621262          (read-string 
    12631263           (format 
    1264             "Version 1 to merge (default: %s's working version): " 
     1264            "Version 1 to merge (default %s's working version): " 
    12651265            (if (stringp file) 
    12661266                (file-name-nondirectory file) "current buffer"))) 
    …… 
    12681268          (read-string 
    12691269           (format 
    1270             "Version 2 to merge (default: %s): " 
     1270            "Version 2 to merge (default %s): " 
    12711271            (if (stringp file) 
    12721272                (file-name-nondirectory file) "current buffer")))) 
    …… 
    12941294          (read-string 
    12951295           (format 
    1296             "Version 1 to merge (default: %s's working version): " 
     1296            "Version 1 to merge (default %s's working version): " 
    12971297            (if (stringp file) 
    12981298                (file-name-nondirectory file) "current buffer"))) 
    …… 
    13001300          (read-string 
    13011301           (format 
    1302             "Version 2 to merge (default: %s): " 
     1302            "Version 2 to merge (default %s): " 
    13031303            (if (stringp file) 
    13041304                (file-name-nondirectory file) "current buffer"))) 
    …… 
    13061306          (read-string 
    13071307           (format 
    1308             "Ancestor version (default: %s's base revision): " 
     1308            "Ancestor version (default %s's base revision): " 
    13091309            (if (stringp file) 
    13101310                (file-name-nondirectory file) "current buffer")))) 
    …… 
    14121412    (setq rev1 
    14131413          (read-string 
    1414            (format "Revision 1 to compare (default: %s's latest revision): " 
     1414           (format "Revision 1 to compare (default %s's latest revision): " 
    14151415                   (file-name-nondirectory file))) 
    14161416          rev2 
    14171417          (read-string 
    1418            (format "Revision 2 to compare (default: %s's current state): " 
     1418           (format "Revision 2 to compare (default %s's current state): " 
    14191419                   (file-name-nondirectory file)))) 
    14201420    (ediff-load-version-control)