apply: convert threeway_stage to object_id

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