Merge branch 'jk/two-way-merge-corner-case-fix' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 81557556707f85b8fbaffeb1e6d639353db1e818..6dd0ec1270050b61c04434e58a8d6596fb3cc07d 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.4.3
+DEF_VER=v1.8.5.1
 
 LF='
 '