i18n: advice: internationalize message for conflicts

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 51aa9e680635e51904f0672b99018167ad1b8b5e..e3d0bed2a9d5df53e0e57bfa4f0eeedf5b6d96e6 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.7.0
+DEF_VER=v2.9.0-rc0
 
 LF='
 '