From f20179519f8cff31263e3695edb51a9402b083ca Mon Sep 17 00:00:00 2001
From: Andrew <48300131+andrewmjordan@users.noreply.github.com>
Date: Sat, 8 Jan 2022 19:51:15 -0800
Subject: [PATCH] Detect more file types for git syntax highlighting (#2330)

* Update git-commit.yaml

This will enable syntax highlighting for merge commit messages

* Update git-commit.yaml
---
 runtime/syntax/git-commit.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/syntax/git-commit.yaml b/runtime/syntax/git-commit.yaml
index 9f8ef0d9..07a71c26 100644
--- a/runtime/syntax/git-commit.yaml
+++ b/runtime/syntax/git-commit.yaml
@@ -1,7 +1,7 @@
 filetype: git-commit
 
 detect:
-    filename: "^(.*[\\/])?(COMMIT_EDITMSG|TAG_EDITMSG)$"
+    filename: "^(.*[\\/])?(COMMIT_EDITMSG|TAG_EDITMSG|MERGE_MSG|git-rebase-todo)$"
 
 rules:
     # File changes
-- 
2.44.0