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

[Michael Kifer]

Index: emacs/lisp/ediff-util.el
diff -c emacs/lisp/ediff-util.el:1.48 emacs/lisp/ediff-util.el:1.49
*** emacs/lisp/ediff-util.el:1.48       Tue Feb  4 06:14:07 2003
--- emacs/lisp/ediff-util.el    Sun May 18 13:18:09 2003
***************
*** 2690,2696 ****
              ((eq ediff-autostore-merges t)
               ;; ask for file name
               (setq merge-store-file
!                    (read-file-name "Save the merge buffer in file: "))
               (ediff-write-merge-buffer-and-maybe-kill
                ediff-buffer-C merge-store-file nil save-and-continue))
              ((and (ediff-buffer-live-p ediff-meta-buffer)
--- 2690,2696 ----
              ((eq ediff-autostore-merges t)
               ;; ask for file name
               (setq merge-store-file
!                    (read-file-name "Save the result of the merge in file: "))
               (ediff-write-merge-buffer-and-maybe-kill
                ediff-buffer-C merge-store-file nil save-and-continue))
              ((and (ediff-buffer-live-p ediff-meta-buffer)