Function: ediff-toggle-show-clashes-only

ediff-toggle-show-clashes-only is an interactive and byte-compiled function defined in ediff-util.el.gz.

Signature

(ediff-toggle-show-clashes-only)

Documentation

Toggle mode showing only merge regions where both variants differ from ancestor.

Key Bindings

Source Code

;; Defined in /usr/src/emacs/lisp/vc/ediff-util.el.gz
;; Merging

(defun ediff-toggle-show-clashes-only ()
  "Toggle mode showing only merge regions where both variants differ from ancestor."
  (interactive)
  (ediff-barf-if-not-control-buffer)
  (if (not ediff-merge-with-ancestor-job)
      (user-error "This command makes sense only when merging with an ancestor"))
  (setq ediff-show-clashes-only (not ediff-show-clashes-only))
  (if ediff-show-clashes-only
      (message "Focus on regions where both buffers differ from the ancestor")
    (message "Canceling focus on regions where changes clash")))