emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Romain Francoise
Subject: [Emacs-diffs] Changes to emacs/lisp/ediff.el
Date: Sat, 24 Sep 2005 09:44:09 -0400

Index: emacs/lisp/ediff.el
diff -c emacs/lisp/ediff.el:1.73 emacs/lisp/ediff.el:1.74
*** emacs/lisp/ediff.el:1.73    Tue Sep 20 17:47:27 2005
--- emacs/lisp/ediff.el Sat Sep 24 13:44:02 2005
***************
*** 1261,1273 ****
      (setq rev1
          (read-string
           (format
!           "Version 1 to merge (default: %s's working version): "
            (if (stringp file)
                (file-name-nondirectory file) "current buffer")))
          rev2
          (read-string
           (format
!           "Version 2 to merge (default: %s): "
            (if (stringp file)
                (file-name-nondirectory file) "current buffer"))))
      (ediff-load-version-control)
--- 1261,1273 ----
      (setq rev1
          (read-string
           (format
!           "Version 1 to merge (default %s's working version): "
            (if (stringp file)
                (file-name-nondirectory file) "current buffer")))
          rev2
          (read-string
           (format
!           "Version 2 to merge (default %s): "
            (if (stringp file)
                (file-name-nondirectory file) "current buffer"))))
      (ediff-load-version-control)
***************
*** 1293,1311 ****
      (setq rev1
          (read-string
           (format
!           "Version 1 to merge (default: %s's working version): "
            (if (stringp file)
                (file-name-nondirectory file) "current buffer")))
          rev2
          (read-string
           (format
!           "Version 2 to merge (default: %s): "
            (if (stringp file)
                (file-name-nondirectory file) "current buffer")))
          ancestor-rev
          (read-string
           (format
!           "Ancestor version (default: %s's base revision): "
            (if (stringp file)
                (file-name-nondirectory file) "current buffer"))))
      (ediff-load-version-control)
--- 1293,1311 ----
      (setq rev1
          (read-string
           (format
!           "Version 1 to merge (default %s's working version): "
            (if (stringp file)
                (file-name-nondirectory file) "current buffer")))
          rev2
          (read-string
           (format
!           "Version 2 to merge (default %s): "
            (if (stringp file)
                (file-name-nondirectory file) "current buffer")))
          ancestor-rev
          (read-string
           (format
!           "Ancestor version (default %s's base revision): "
            (if (stringp file)
                (file-name-nondirectory file) "current buffer"))))
      (ediff-load-version-control)
***************
*** 1411,1421 ****
    (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
--- 1411,1421 ----
    (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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]