Merge branch 'fc/rerere-conflict-style'

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