Mercurial > emacs

changeset 47821:45dcf3407814

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-ediff): Autoload.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 10 Oct 2002 13:01:14 +0000
parents ac369f2f8f6a
children 46f8bf0fc7b4
files lisp/smerge-mode.el
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/smerge-mode.el	Thu Oct 10 08:49:31 2002 +0000
+++ b/lisp/smerge-mode.el	Thu Oct 10 13:01:14 2002 +0000
@@ -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 @@
 (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