merge-recursive: don't segfault while handling rename clashes

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 6c7465c75865577a87260c7936cb286ab84c6db6..e5e62ef0de781d7b96ff21017a912cb3d9aa1da5 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.6.0.2.GIT
+DEF_VER=v1.6.1.4
 
 LF='
 '