Skip to content
Browse files

Use Git Commit grammar for .git/MERGE_MSG files

Also make COMMIT_EDITMSG a match for .git/COMMIT_EDITMSG just incase another build system use the same filename.
  • Loading branch information...
1 parent 35fafb4 commit a8b52858bdb6339c257479d5486c5b887258cddf @sorbits sorbits committed
Showing with 2 additions and 1 deletion.
  1. +2 −1 Syntaxes/Git Commit Message.tmLanguage
View
3 Syntaxes/Git Commit Message.tmLanguage
@@ -4,7 +4,8 @@
<dict>
<key>fileTypes</key>
<array>
- <string>COMMIT_EDITMSG</string>
+ <string>.git/COMMIT_EDITMSG</string>
+ <string>.git/MERGE_MSG</string>
</array>
<key>foldingStartMarker</key>
<string>^\+\+\+</string>

0 comments on commit a8b5285

Please sign in to comment.
Something went wrong with that request. Please try again.