Searched refs:smerge (Results 1 - 1 of 1) sorted by relevance

/macosx-10.9.5/emacs-92/emacs/lisp/
H A Dsmerge-mode.el0 ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts
31 ;; (autoload 'smerge-mode "smerge-mode" nil t)
36 ;; (defun sm-try-smerge ()
40 ;; (smerge-mode 1))))
41 ;; (add-hook 'find-file-hook 'sm-try-smerge t)
53 (defvar smerge-mode)
55 (defgroup smerge () function
58 :prefix "smerge-")
60 (defcustom smerge
[all...]

Completed in 110 milliseconds