Skip to content
Browse files

Detect MERGE_MSG

  • Loading branch information...
1 parent 2d54fb2 commit 75bc1628833ee1f1d8ecb8a66c5df852554c9a19 @tpope committed
Showing with 1 addition and 2 deletions.
  1. +1 −2 ftdetect/git.vim
View
3 ftdetect/git.vim
@@ -1,6 +1,5 @@
" Git
-autocmd BufNewFile,BufRead *.git/COMMIT_EDITMSG set ft=gitcommit
-autocmd BufNewFile,BufRead *.git/modules/**/COMMIT_EDITMSG set ft=gitcommit
+autocmd BufNewFile,BufRead *.git/{modules/**/}{COMMIT_EDIT,MERGE_}MSG set ft=gitcommit
autocmd BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules set ft=gitconfig
autocmd BufNewFile,BufRead *.git/modules/**/config set ft=gitconfig
autocmd BufNewFile,BufRead git-rebase-todo set ft=gitrebase

0 comments on commit 75bc162

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