builtin/merge.c: fix a bug with trivial merges

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 51ae63d753b6a27c151413f9221d54dda1f9f7a4..655b49011fa5ce2aa1ea2c169aad2eb241dc5027 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.5.5
+DEF_VER=v2.8.0.GIT
 
 LF='
 '