# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1120407134 0
# Node ID 1eb58fde25d4885196d5840c59247e11e1f9eb19
# Parent  9eca51cb6ae384b24961a919ff6f2e326ed21ac9
(smerge-mode): Add duplicate defvar near top.

diff -r 9eca51cb6ae3 -r 1eb58fde25d4 lisp/smerge-mode.el
--- a/lisp/smerge-mode.el	Sun Jul 03 16:11:30 2005 +0000
+++ b/lisp/smerge-mode.el	Sun Jul 03 16:12:14 2005 +0000
@@ -48,6 +48,9 @@
 (eval-when-compile (require 'cl))
 
 
+;;; The real definition comes later.
+(defvar smerge-mode)
+
 (defgroup smerge ()
   "Minor mode to resolve diff3 conflicts."
   :group 'tools