builtin-merge.c: use standard active_cache macros

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index d11e43cf31567383bcaf91fcfb95e737f1309520..1628d986fe44aabf33d7b9e88082b52cb2640986 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.6.5.1
+DEF_VER=v1.6.6
 
 LF='
 '