diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2003-05-18 17:18:09 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2003-05-18 17:18:09 +0000 |
| commit | 6e31f65f1639b7740cfb85c8320d80110f5eeeab (patch) | |
| tree | fecacdf006f759c7912d5acc96189d7004fafd55 /lisp/ediff-util.el | |
| parent | 4dd68254fbdd72e492b6537607e489ba14e4cac8 (diff) | |
| download | emacs-6e31f65f1639b7740cfb85c8320d80110f5eeeab.tar.gz | |
2003-05-18 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-mult.el (ediff-default-filtering-regexp): new variable.
* ediff-util.el (ediff-maybe-save-and-delete-merge): change in a
message.
* ediff.el (ediff-directories,ediff-directory-revisions,
ediff-directories3,ediff-merge-directories,
ediff-merge-directories-with-ancestor,ediff-merge-directory-revisions,
ediff-merge-directory-revisions-with-ancestor): make use of the new
ediff-default-filtering-regexp variable.
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 3dda354be15..b551f056432 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -2690,7 +2690,7 @@ only if this merge job is part of a group, i.e., was invoked from within ((eq ediff-autostore-merges t) ;; ask for file name (setq merge-store-file - (read-file-name "Save the merge buffer in 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) |