Merge branch 'jm/mergetool-pathspec' into maint-1.7.6

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 08e864869bdc70a5afe63d7d99de5c30e725a4a9..b42c77c392e5bb68c5d8f33dcff24e517732d51c 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-rc2
+DEF_VER=v1.7.6.4
 
 LF='
 '