Allow the user to control the verbosity of merge-recursive.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 966b35d6e86b4a317fc5f9c525d059d4d48b500a..8502e4c5b2cd0235583e975d1e3670b97a4341c3 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.4.4-rc2.GIT
+DEF_VER=v1.5.0-rc1.GIT
 
 LF='
 '