Merge pull request #6 from iliakan/master

Also highlight MERGE_MSG (for git merge --log)
adambullmer · Dec 11, 2018 · c8cdf76 · c8cdf76
2 parents 9620c26 + 9990bce
commit c8cdf76
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/commit-message.JSON-tmLanguage b/commit-message.JSON-tmLanguage
@@ -2,7 +2,7 @@
 {
     "name": "Commit Message",
     "scopeName": "text.git-commit-message",
-    "fileTypes": ["COMMIT_EDITMSG"],
+    "fileTypes": ["COMMIT_EDITMSG","MERGE_MSG"],
     "uuid": "6e83eb4a-b9de-42e5-a5fb-6371dac1c37e",
 
     "patterns": [{

diff --git a/commit-message.tmLanguage b/commit-message.tmLanguage
@@ -5,6 +5,7 @@
 	<key>fileTypes</key>
 	<array>
 		<string>COMMIT_EDITMSG</string>
+		<string>MERGE_MSG</string>
 	</array>
 	<key>name</key>
 	<string>Commit Message</string>