Add merge-subtree back

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 3c3cd2f27d7b3af06a64b166a5fa9b48254ddbdd..2ba142a11ecb5140c55b0f14c10b8be230400f21 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.2.2.GIT
+DEF_VER=v1.5.4-rc3.GIT
 
 LF='
 '