Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 3f41a87bed47b37ba362fb3a69e378297ce4631b..48715012bee68c5df07a49e9bce83240b8631746 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.0.5.GIT
+DEF_VER=v1.5.1.GIT
 
 LF='
 '