diff options
| author | Jesse Luehrs <doy@tozt.net> | 2014-04-07 12:24:33 -0400 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2014-04-07 16:40:24 -0400 |
| commit | 7fd13f947bf91393a76898f4917dbba92375280c (patch) | |
| tree | 1bab6962356681dce20bae307793555f1d1f5ce6 /vimrc | |
| parent | db1a7c2ad2b0421bb14b45401484ba066ed76e30 (diff) | |
| download | conf-7fd13f947bf91393a76898f4917dbba92375280c.tar.gz conf-7fd13f947bf91393a76898f4917dbba92375280c.zip | |
diff3 conflictstyle also uses |||||||
Diffstat (limited to 'vimrc')
| -rw-r--r-- | vimrc | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -278,7 +278,7 @@ autocmd InsertLeave * syn clear EOLWS | syn match EOLWS excludenl /\s\+$/ highlight EOLWS ctermbg=red guibg=red " }}} " conflict markers {{{ -match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$' +match ErrorMsg '^\(<\||\|=\|>\)\{7\}\([^=].\+\)\?$' " }}} " fonts {{{ if has('win32') || has('win64') || has('win32unix') |