t6044: add more testcases with staged changes before a merge is invoked

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b4fb7d9a39f39513d3c29004f470920865b3f9ec..4baa413c74989af27b9df0cd1b365d8f90842a89 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.17.0-rc1
+DEF_VER=v2.17.1
 
 LF='
 '