rebase: extract merge code to new source file

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 702306acd2c10d1cbe04c26bf3b89bafadb256f7..92fe7a59dbf81b0a055280f9351811641ce7044a 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.3.3
+DEF_VER=v1.7.4
 
 LF='
 '