merge-recursive: fix numerous argument alignment issues

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