From fe3f8866d81f32ef4edb2cd5be7214ad86b65447 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Tue, 14 Dec 2021 00:34:04 +0100
Subject: [PATCH] fix(evil): disable evil-collection-smerge-mode

evil-collection-smerge-mode is broken due to incorrect pathing upstream,
so evilified keybinds for smerge-mode will have to wait until it is
addressed there.

Amend: 8d6221bc1e36
Amend: 7bbc3bc48eaf
---
 modules/editor/evil/init.el | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/editor/evil/init.el b/modules/editor/evil/init.el
index b0ee655a3..aba5af168 100644
--- a/modules/editor/evil/init.el
+++ b/modules/editor/evil/init.el
@@ -221,7 +221,6 @@ variable for an explanation of the defaults (in comments). See
       simple
       slime
       sly
-      smerge-mode
       speedbar
       tablist
       tar-mode