merge-recursive: fix numerous argument alignment issues

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 1534654ffc1a4c4a87e3a1b0b47abc4ea23e6da0..1971bf34c3bcf45399ec15e496cb3072004d6324 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.13.7
+DEF_VER=v2.18.0-rc1
 
 LF='
 '