[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-merg.el
From: |
Pavel Janík |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-merg.el |
Date: |
Thu, 20 Dec 2001 13:38:33 -0500 |
Index: emacs/lisp/ediff-merg.el
diff -c emacs/lisp/ediff-merg.el:1.20 emacs/lisp/ediff-merg.el:1.21
*** emacs/lisp/ediff-merg.el:1.20 Mon Jul 16 03:46:48 2001
--- emacs/lisp/ediff-merg.el Thu Dec 20 13:38:32 2001
***************
*** 82,88 ****
(defcustom ediff-show-clashes-only nil
"*If t, show only those diff regions where both buffers disagree with the
ancestor.
This means that regions that have status prefer-A or prefer-B will be
! skipped over. Nil means show all regions."
:type 'boolean
:group 'ediff-merge
)
--- 82,88 ----
(defcustom ediff-show-clashes-only nil
"*If t, show only those diff regions where both buffers disagree with the
ancestor.
This means that regions that have status prefer-A or prefer-B will be
! skipped over. nil means show all regions."
:type 'boolean
:group 'ediff-merge
)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/ediff-merg.el,
Pavel Janík <=