[Emacs-diffs] Changes to emacs/lisp/ediff.el

[Michael Kifer]

Index: emacs/lisp/ediff.el
diff -c emacs/lisp/ediff.el:1.59 emacs/lisp/ediff.el:1.60
*** emacs/lisp/ediff.el:1.59    Sun Nov 17 17:26:48 2002
--- emacs/lisp/ediff.el Sat Jan 25 03:09:15 2003
***************
*** 1,13 ****
  ;;; ediff.el --- a comprehensive visual interface to diff & patch
  
! ;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02 Free Software 
Foundation, Inc.
  
  ;; Author: Michael Kifer <address@hidden>
  ;; Created: February 2, 1994
  ;; Keywords: comparing, merging, patching, tools, unix
  
! (defconst ediff-version "2.77" "The current version of Ediff")
! (defconst ediff-date "March 5, 2002" "Date of last update")  
  
  
  ;; This file is part of GNU Emacs.
--- 1,13 ----
  ;;; ediff.el --- a comprehensive visual interface to diff & patch
  
! ;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 03 Free Software 
Foundation, Inc.
  
  ;; Author: Michael Kifer <address@hidden>
  ;; Created: February 2, 1994
  ;; Keywords: comparing, merging, patching, tools, unix
  
! (defconst ediff-version "2.78" "The current version of Ediff")
! (defconst ediff-date "January 25, 2003" "Date of last update")  
  
  
  ;; This file is part of GNU Emacs.
***************
*** 1353,1363 ****
    (let (rev1 rev2)
      (setq rev1
          (read-string
!          (format "Version 1 to compare (default: %s's working version): "
                   (file-name-nondirectory file)))
          rev2
          (read-string 
!          (format "Version 2 to compare (default: %s): "
                   (file-name-nondirectory file))))
      (ediff-load-version-control)
      (funcall
--- 1353,1363 ----
    (let (rev1 rev2)
      (setq rev1
          (read-string
!          (format "Revision 1 to compare (default: %s's latest revision): "
                   (file-name-nondirectory file)))
          rev2
          (read-string 
!          (format "Revision 2 to compare (default: %s's current state): "
                   (file-name-nondirectory file))))
      (ediff-load-version-control)
      (funcall