merge: backport GIT_MERGE_AUTOEDIT support

[git.git] / GIT-VERSION-GEN

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b42c77c392e5bb68c5d8f33dcff24e517732d51c..8ddc96d952c48bd87055591f5b03118f00724010 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.6.4
+DEF_VER=v1.7.9.4
 
 LF='
 '