Merge branch 'jk/mergetool-lib-refactor'

diff --git a/git-gui/GIT-VERSION-GEN b/git-gui/GIT-VERSION-GEN
index 49b62ea6ebc61c4af16d7d740e5b423e5787b915..0a1f8d4f8a9187a0d5decf20f9c926dbd570a8db 100755 (executable)
--- a/git-gui/GIT-VERSION-GEN
+++ b/git-gui/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=0.17.GITGUI
+DEF_VER=0.18.GITGUI
 
 LF='
 '