Searched +refs:ediff +refs:merge (Results 1 - 1 of 1) sorted by relevance

/macosx-10.10/emacs-93/emacs/lisp/
H A Dediff-util.el0 ;;; ediff-util.el --- the core commands and utilities of ediff
31 (defvar ediff-patch-diagnostics)
32 (defvar ediff-patchbufer)
33 (defvar ediff-use-toolbar-p)
34 (defvar ediff-toolbar-height)
35 (defvar ediff-toolbar)
36 (defvar ediff-toolbar-3way)
41 (defvar ediff-emacs-p)
43 (defvar ediff
[all...]

Completed in 184 milliseconds