diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-11-17 22:26:48 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2002-11-17 22:26:48 +0000 |
| commit | 6dfd1bcc543f505d8bbc579c6b358744b5e7cfd6 (patch) | |
| tree | 3361e9e3e2d260207745631f527150686267fb8f /lisp/ediff-mult.el | |
| parent | d283d229dc1ca3383a1d34a8d283232ad6297f2e (diff) | |
| download | emacs-6dfd1bcc543f505d8bbc579c6b358744b5e7cfd6.tar.gz | |
2002-11-17 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-diff.el (ediff-setup-diff-regions): change regexp.
* ediff-mult.el: comments.
* ediff.el: comments.
Diffstat (limited to 'lisp/ediff-mult.el')
| -rw-r--r-- | lisp/ediff-mult.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el index 8e526c03659..a96450c9cf4 100644 --- a/lisp/ediff-mult.el +++ b/lisp/ediff-mult.el @@ -505,7 +505,8 @@ behavior." ;; DIR1, DIR2, DIR3 are directories. DIR3 can be nil. ;; OUTPUT-DIR is a directory for auto-storing the results of merge jobs. ;; Can be nil. -;; REGEXP is a regexp used to filter out files in the directories. +;; REGEXP is nil or a filter regexp; only file names that match the regexp +;; are considered. ;; If a file is a directory in dir1 but not dir2 (or vice versa), it is not ;; included in the intersection. However, a regular file that is a dir in dir3 ;; is included, since dir3 files are supposed to be ancestors for merging. |