/[emacs]/emacs/lisp/ediff-util.el
ViewVC logotype

Diff of /emacs/lisp/ediff-util.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.48 by lektu, Tue Feb 4 11:14:07 2003 UTC revision 1.49 by kifer, Sun May 18 17:18:09 2003 UTC
# Line 2690  only if this merge job is part of a grou Line 2690  only if this merge job is part of a grou
2690                ((eq ediff-autostore-merges t)                ((eq ediff-autostore-merges t)
2691                 ;; ask for file name                 ;; ask for file name
2692                 (setq merge-store-file                 (setq merge-store-file
2693                       (read-file-name "Save the merge buffer in file: "))                       (read-file-name "Save the result of the merge in file: "))
2694                 (ediff-write-merge-buffer-and-maybe-kill                 (ediff-write-merge-buffer-and-maybe-kill
2695                  ediff-buffer-C merge-store-file nil save-and-continue))                  ediff-buffer-C merge-store-file nil save-and-continue))
2696                ((and (ediff-buffer-live-p ediff-meta-buffer)                ((and (ediff-buffer-live-p ediff-meta-buffer)

Legend:
Removed from v.1.48  
changed lines
  Added in v.1.49

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26