Vim detects the filetype of Git commit message buffers, but because Git uses a different filename for merge messages than it does for normal commit messages, Vim does not similarly detect the filetype for merge messages. The attached patch fixes this.
diff -r b1b18442cf4b runtime/filetype.vim --- a/runtime/filetype.vim Tue Nov 20 17:55:10 2012 +0100 +++ b/runtime/filetype.vim Wed Jan 30 16:27:28 2013 -0500 @@ -744,6 +744,7 @@ " Git au BufNewFile,BufRead *.git/COMMIT_EDITMSG setf gitcommit +au BufNewFile,BufRead *.git/MERGE_MSG setf gitcommit au BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig au BufNewFile,BufRead *.git/modules/**/COMMIT_EDITMSG setf gitcommit au BufNewFile,BufRead *.git/modules/**/config setf gitconfig
signature.asc
Description: Digital signature
