Searched +defs:ediff +defs:merge +defs:revisions +defs:with +defs:ancestor (Results 1 - 2 of 2) sorted by relevance

/macosx-10.9.5/emacs-92/emacs/lisp/
H A Dediff.el138 (defgroup ediff nil function
368 (defalias 'ediff 'ediff-files) function
[all...]
H A Dldefs-boot.el8560 (defalias (quote ediff) (quote ediff-files)) function
[all...]

Completed in 140 milliseconds