merge-tree: lose unused "resolve_directories"

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index ecdbf905a32288937e1a3eec65aa7f925ea30446..76ffd4d4d6ad4f554fe1601e82f73865a4ced3d4 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.12.3
+DEF_VER=v1.8.1-rc0
 
 LF='
 '