contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 5b367ab7feab2822b972b0051e205eeb940e0519..40adbf7bf79ad7d7800b71d2ca79418cdbddd3ed 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.0.0-rc0
+DEF_VER=v2.0.0.GIT
 
 LF='
 '