[Emacs-diffs] Changes to emacs/lisp/ediff-merg.el

[Pavel Janík]

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
    )