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) |