diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-10-10 13:01:14 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-10-10 13:01:14 +0000 |
| commit | a1038ca0453984f826f40ee6ff2298444fba74fd (patch) | |
| tree | 89b709621af84d9d0c215f12b9917c04fc9a3bac /lisp/smerge-mode.el | |
| parent | 36c7760905cc659bfaaac1d04f91e6a754e95939 (diff) | |
(smerge-ediff): Autoload.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 47663a59c97..4c68293cf40 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -4,7 +4,7 @@ ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: merge diff3 cvs conflict -;; Revision: $Id: smerge-mode.el,v 1.17 2002/09/03 01:20:20 monnier Exp $ +;; Revision: $Id: smerge-mode.el,v 1.18 2002/10/04 15:25:22 monnier Exp $ ;; This file is part of GNU Emacs. @@ -417,6 +417,7 @@ The point is moved to the end of the conflict." (defvar ediff-buffer-B) (defvar ediff-buffer-C) +;;;###autoload (defun smerge-ediff (&optional name-mine name-other name-base) "Invoke ediff to resolve the conflicts. NAME-MINE, NAME-OTHER, and NAME-BASE, if non-nil, are used for the |