oneway_merge(): only lstat() when told to update worktree

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index d98481a10c2e202257225eb48aac14ae6224cbec..74513903e82e380eca58140945334ad75c36b972 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.2
+DEF_VER=v1.7.12.4
 
 LF='
 '