From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 10 Oct 2002 13:01:14 +0000 (+0000)
Subject: (smerge-ediff): Autoload.
X-Git-Tag: ttn-vms-21-2-B4~12883
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a1038ca0453984f826f40ee6ff2298444fba74fd;p=emacs.git

(smerge-ediff): Autoload.
---

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