Merge branch 'da/difftool' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 7ed482057c78a7aee87205b2aa81e096bd074d51..596965a4de6c3d965a6967a2ed94eb79eb762b5f 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.6.5
+DEF_VER=v2.8.3
 
 LF='
 '