merge-recursive: make "Auto-merging" comment show for other merges

[thirdparty/git.git] / GIT-VERSION-GEN

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b4fb7d9a39f39513d3c29004f470920865b3f9ec..12ff59c2c78565a1ad9c491147d2b8e0615aa1e5 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.17.0-rc1
+DEF_VER=v2.17.GIT
 
 LF='
 '