apply: convert threeway_stage to object_id

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 4e1cc6ce6164fd01691443c5901dd425c5ad2360..50078659fcec88359310e9db691ed6b2ae9ade0e 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.5.6
+DEF_VER=v2.3.2
 
 LF='
 '