Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'languages.toml')
| -rw-r--r-- | languages.toml | 2 |
1 files changed, 1 insertions, 1 deletions
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] |