Exhibit merge bug that clobbers index&WT

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 8ccaba87b4a070d1de0f0776270060aaa5effc4b..0ad39484eceab30360e1f46c6057a873ca2c26f1 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.0.6
+DEF_VER=v1.7.1
 
 LF='
 '