t6022: Add tests for reversing order of merges when D/F conflicts present

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 0cbf04373151f8415593824642a28f175e37b642..ac9c4dbf2fe692fa8385c2d2c54f4122339204de 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.3-rc1
+DEF_VER=v1.7.3
 
 LF='
 '