Variable: ediff-skip-merge-regions-that-differ-from-default

ediff-skip-merge-regions-that-differ-from-default is a customizable and buffer-local variable defined in ediff-merg.el.gz.

Documentation

If t, show only the regions that have not been changed by the user.

A region is considered to have been changed if it is different from the current default (default-A, default-B, combined) and it hasn't been marked as prefer-A or prefer-B. A region is considered to have been changed also when it is marked as prefer-A, but is different from the corresponding difference region in Buffer A or if it is marked as prefer-B and is different from the region in Buffer B.

Source Code

;; Defined in /usr/src/emacs/lisp/vc/ediff-merg.el.gz
(defcustom ediff-skip-merge-regions-that-differ-from-default nil
  "If t, show only the regions that have not been changed by the user.
A region is considered to have been changed if it is different from the current
default (`default-A', `default-B', `combined') and it hasn't been marked as
`prefer-A' or `prefer-B'.
A region is considered to have been changed also when it is marked as
`prefer-A', but is different from the corresponding difference region in
Buffer A or if it is marked as `prefer-B' and is different from the region in
Buffer B."
  :type 'boolean
  :group 'ediff-merge
  )