diff options
| author | Dan Reif <35710107+CH-DanReif@users.noreply.github.com> | 2018-06-05 14:18:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-05 14:18:09 -0700 |
| commit | d362dca9b3373c2ddc8526eaa80b02bfaa274c7d (patch) | |
| tree | 3016d45f4f2714937790a989be8adda3fe942ae3 /syntax/git.vim | |
| parent | a26134de3c09f9725667e14e7073a701bcff4e19 (diff) | |
| parent | 1f34e0adcfb54b45760d7570d4c270a939daa03b (diff) | |
| download | vim-polyglot-d362dca9b3373c2ddc8526eaa80b02bfaa274c7d.tar.gz vim-polyglot-d362dca9b3373c2ddc8526eaa80b02bfaa274c7d.zip | |
Merge pull request #315 from sheerun/periodic_rebuild_20180605
Update (periodic rebuild)
Diffstat (limited to 'syntax/git.vim')
| -rw-r--r-- | syntax/git.vim | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/syntax/git.vim b/syntax/git.vim index 53f44d36..022c1dcc 100644 --- a/syntax/git.vim +++ b/syntax/git.vim @@ -27,7 +27,9 @@ syn region gitDiff start=/^\%(@@ -\)\@=/ end=/^\%(diff --\%(git\|cc\|combined\) syn region gitDiffMerge start=/^\%(diff --\%(cc\|combined\) \)\@=/ end=/^\%(diff --\|$\)\@=/ contains=@gitDiff syn region gitDiffMerge start=/^\%(@@@@* -\)\@=/ end=/^\%(diff --\|$\)\@=/ contains=@gitDiff syn match gitDiffAdded "^ \++.*" contained containedin=gitDiffMerge +syn match gitDiffAdded "{+.*+}" contained containedin=gitDiff syn match gitDiffRemoved "^ \+-.*" contained containedin=gitDiffMerge +syn match gitDiffRemoved "\[-.*-\]" contained containedin=gitDiff syn match gitKeyword /^\%(object\|type\|tag\|commit\|tree\|parent\|encoding\)\>/ contained containedin=gitHead nextgroup=gitHash,gitType skipwhite syn match gitKeyword /^\%(tag\>\|ref:\)/ contained containedin=gitHead nextgroup=gitReference skipwhite |