Merge branch 'fc/rerere-conflict-style'

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index faecf33417b354e3e5ae51369f9a7724869df9cc..5d6dc5b4c6855765fecc32d036bcf19809fa1620 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.0.0-rc3
+DEF_VER=v2.0.0
 
 LF='
 '