Variable: ediff-show-clashes-only

ediff-show-clashes-only is a customizable and buffer-local variable defined in ediff-merg.el.gz.

Documentation

If t, show only 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. A value of nil means show all regions.

Source Code

;; Defined in /usr/src/emacs/lisp/vc/ediff-merg.el.gz
(defcustom ediff-show-clashes-only nil
  "If t, show only 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.  A value of nil means show all regions."
  :type 'boolean
  :local t
  :group 'ediff-merge)