merge-tree: don't print entries that match "local"

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 07685f469777e13ed7ad67291e82a69920bd42bd..6f09e2ff8bbd1b84e35a65ecf834a6ebea791532 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.1.3
+DEF_VER=v1.8.1.5
 
 LF='
 '