From 7f84c46eb8576cc8351060ffd5075ac3516c0ce6 Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Sun, 3 Jul 2005 16:12:14 +0000
Subject: [PATCH] (smerge-mode): Add duplicate defvar near top.

---
 lisp/smerge-mode.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 55000391777..9e129c3571d 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -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
-- 
2.39.2