From 52c8dc9d09737c0185c85cd6194d91f3e18dff08 Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Sat, 8 Jul 2017 13:39:48 +0900
Subject: [PATCH] Highliight git MERGE_MSG files as commit messages

---
 rc/base/git.kak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rc/base/git.kak b/rc/base/git.kak
index 7648f435..b171df95 100644
--- a/rc/base/git.kak
+++ b/rc/base/git.kak
@@ -1,4 +1,4 @@
-hook global BufCreate .*COMMIT_EDITMSG %{
+hook global BufCreate .*(COMMIT_EDITMSG|MERGE_MSG) %{
     set buffer filetype git-commit
 }