[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-util.el
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-util.el |
Date: |
Fri, 04 Nov 2005 00:40:05 -0500 |
Index: emacs/lisp/ediff-util.el
diff -c emacs/lisp/ediff-util.el:1.64 emacs/lisp/ediff-util.el:1.65
*** emacs/lisp/ediff-util.el:1.64 Thu Oct 6 00:09:48 2005
--- emacs/lisp/ediff-util.el Fri Nov 4 05:40:03 2005
***************
*** 1794,1799 ****
--- 1794,1800 ----
skip-changed
;; skip difference regions that differ in white space
(and ediff-ignore-similar-regions
+ (ediff-merge-region-is-non-clash n)
(or (eq (ediff-no-fine-diffs-p n) t)
(and (ediff-merge-job)
(eq (ediff-no-fine-diffs-p n) 'C)))
- [Emacs-diffs] Changes to emacs/lisp/ediff-util.el,
Michael Kifer <=