master a477015: Fix build issue with smerge-mode

[Lars Ingebrigtsen]

branch: master
commit a4770152f5f969060edf7a149aa2ee7ff5f5abac
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Fix build issue with smerge-mode
    
    * lisp/vc/smerge-mode.el (easy-mmode): Require.
---
 lisp/vc/smerge-mode.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 5a0b908..0be1a03 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -47,6 +47,7 @@
 (require 'diff)                                ;For diff-check-labels.
 (require 'diff-mode)                    ;For diff-refine.
 (require 'newcomment)
+(require 'easy-mmode)
 
 ;;; The real definition comes later.
 (defvar smerge-mode)