Variable: smerge-diff-switches

smerge-diff-switches is a customizable variable defined in smerge-mode.el.gz.

Value

("-d" "-b" "-u")

Documentation

A list of strings specifying switches to be passed to diff.

Used in smerge-diff-base-upper and related functions.

Source Code

;; Defined in /usr/src/emacs/lisp/vc/smerge-mode.el.gz
(defcustom smerge-diff-switches
  (append '("-d" "-b")
	  (if (listp diff-switches) diff-switches (list diff-switches)))
  "A list of strings specifying switches to be passed to diff.
Used in `smerge-diff-base-upper' and related functions."
  :type '(repeat string))