Default GIT_MERGE_VERBOSITY to 5 during tests.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index eca1ff2175c9c62ce51fe6606d615f99925e7734..8f266d0859133002ebca5c923fb2ed925d5639b3 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.GIT
+DEF_VER=v1.5.0-rc3.GIT
 
 LF='
 '