Don't highlight merge conflict as subject

This fixes the highlighting of `git status` as file type gitcommit during a merge conflict.
tpope · Oct 18, 2009 · 24d0f11 · 24d0f11
1 parent 5184ea5
commit 24d0f11
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/syntax/gitcommit.vim b/syntax/gitcommit.vim
@@ -43,6 +43,10 @@ syn match   gitcommitSelectedFile	".\{-\}\%($\| -> \)\@=" contained nextgroup=gi
 syn match   gitcommitDiscardedArrow	" -> " contained nextgroup=gitcommitDiscardedFile
 syn match   gitcommitSelectedArrow	" -> " contained nextgroup=gitcommitSelectedFile
 
+syn match   gitcommitBegin		"\%^" nextgroup=gitcommitWarning,gitcommitSummary
+syn match   gitcommitWarning		"^[^#].*: needs merge$" nextgroup=gitcommitWarning skipnl contained
+syn match   gitcommitWarning		"^no changes added to commit\>.*\%$"
+
 hi def link gitcommitSummary		Keyword
 hi def link gitcommitComment		Comment
 hi def link gitcommitUntracked		gitcommitComment