aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMirek Kratochvil <miroslav.kratochvil@uni.lu>2025-10-14 10:36:54 +0200
committerMirek Kratochvil <miroslav.kratochvil@uni.lu>2025-10-14 10:36:54 +0200
commit6beaeec8e773d8494d084ce49d87c62929da5b2e (patch)
tree9ba85881e9e0cf33c411ca8f589063a11fef4dd9
parent6682b5ed37efd88d85c449976581484c933bbe87 (diff)
downloadwerge-6beaeec8e773d8494d084ce49d87c62929da5b2e.tar.gz
werge-6beaeec8e773d8494d084ce49d87c62929da5b2e.tar.bz2
add vim syntax file for diffs
-rw-r--r--vim/wergediff.vim8
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