From 6dfd1bcc543f505d8bbc579c6b358744b5e7cfd6 Mon Sep 17 00:00:00 2001 From: Michael Kifer Date: Sun, 17 Nov 2002 22:26:48 +0000 Subject: 2002-11-17 Michael Kifer * ediff-diff.el (ediff-setup-diff-regions): change regexp. * ediff-mult.el: comments. * ediff.el: comments. --- lisp/ediff-mult.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lisp/ediff-mult.el') 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. -- cgit v1.2.1