diff options
Diffstat (limited to 'vim')
| -rw-r--r-- | vim/wergediff.vim | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vim/wergediff.vim b/vim/wergediff.vim new file mode 100644 index 0000000..6766e06 --- /dev/null +++ b/vim/wergediff.vim @@ -0,0 +1,8 @@ + +syntax region wergeDiffChange start=/<<<<</ end=/>>>>>/ contains=wergeDiffRm,wergeDiffAdd +syntax region wergeDiffRm start=/<<<<</hs=e+1 end=/|||||/he=b-1,me=b-1 contained +syntax region wergeDiffAdd start=/|||||/hs=e+1 end=/>>>>>/he=b-1,me=b-1 contained + +highlight default link wergeDiffChange Comment +highlight default link wergeDiffRm Removed +highlight default link wergeDiffAdd Added |