Merge branch 'tg/conflict-marker-size' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 5998893dd7005f5ce63946ae5ec53bb18a20c3e9..164fa4f49967817434d55ef2ff5f8ec851a42965 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.18.1
+DEF_VER=v2.19.1
 
 LF='
 '