diff options
Diffstat (limited to 'lisp/vc/smerge-mode.el')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 003b26eca41..e13894d6b53 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -23,11 +23,10 @@ ;;; Commentary: ;; Provides a lightweight alternative to emerge/ediff. -;; To use it, simply add to your .emacs the following lines: ;; -;; (autoload 'smerge-mode "smerge-mode" nil t) +;; To use it, simply type `M-x smerge-mode'. ;; -;; you can even have it turned on automatically with the following +;; You can even have it turned on automatically with the following ;; piece of code in your .emacs: ;; ;; (defun sm-try-smerge () |