# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1034254874 0
# Node ID 45dcf3407814da212a70341953e194a92b77358e
# Parent  ac369f2f8f6af5308cae6586b053d73b440bed89
(smerge-ediff): Autoload.

diff -r ac369f2f8f6a -r 45dcf3407814 lisp/smerge-mode.el
--- 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