Variable: cvs-idiff-imerge-handlers

cvs-idiff-imerge-handlers is a customizable variable defined in pcvs-defs.el.gz.

Value

(cvs-ediff-diff . cvs-ediff-merge)

Documentation

Pair of functions to be used for resp. diff'ing and merg'ing interactively.

Source Code

;; Defined in /usr/src/emacs/lisp/vc/pcvs-defs.el.gz
(defcustom cvs-idiff-imerge-handlers
  (if (fboundp 'ediff)
      '(cvs-ediff-diff . cvs-ediff-merge)
    '(cvs-emerge-diff . cvs-emerge-merge))
  "Pair of functions to be used for resp. diff'ing and merg'ing interactively."
  :type '(choice (const :tag "Ediff" (cvs-ediff-diff . cvs-ediff-merge))
		 (const :tag "Emerge" (cvs-emerge-diff . cvs-emerge-merge))))