mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-27 07:37:33 +00:00
(smerge-mode): Add duplicate defvar near top.
This commit is contained in:
parent
f4f2bca3de
commit
7f84c46eb8
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user