From 7cc93eb1c554e72a5aa0c18d244c0fd3ec07d97f Mon Sep 17 00:00:00 2001
From: Christoph Heiss <contact@christoph-heiss.at>
Date: Sat, 18 Jan 2025 19:50:03 +0100
Subject: [PATCH] feat: add `MERGE_MSG` file glob for git-commit (#12589)
---
languages.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/languages.toml b/languages.toml
index 50bc50b4..a99516db 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1734,7 +1734,7 @@ grammar = "yaml"
[[language]]
name = "git-commit"
scope = "git.commitmsg"
-file-types = [{ glob = "COMMIT_EDITMSG" }]
+file-types = [{ glob = "COMMIT_EDITMSG" }, { glob = "MERGE_MSG" }]
comment-token = "#"
indent = { tab-width = 2, unit = " " }
rulers = [51, 73]