[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-mult.el
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-mult.el |
Date: |
Fri, 04 Apr 2003 01:21:53 -0500 |
Index: emacs/lisp/ediff-mult.el
diff -c emacs/lisp/ediff-mult.el:1.30 emacs/lisp/ediff-mult.el:1.31
*** emacs/lisp/ediff-mult.el:1.30 Fri Oct 18 04:52:37 2002
--- emacs/lisp/ediff-mult.el Sun Nov 17 17:26:48 2002
***************
*** 505,511 ****
;; 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.
;; 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.
--- 505,512 ----
;; 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 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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/ediff-mult.el,
Miles Bader <=