feat: add MERGE_MSG file glob for git-commit (helix-editor#12589)

christoph-heiss · web-flow · commit 7cc93eb1c554 · 2025-01-18T12:50:03.000-06:00
diff --git 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]
