merge: refuse to create too cool a merge by default

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 4b0af4d5be8c10e7c6c9fcb77d5ec94a48ca45f7..0305065d590568b2df765fbdb471678e8fd0a2e3 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.4.11
+DEF_VER=v2.7.4
 
 LF='
 '