t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index ab04c977be0cfdb6f282b7911d3fe630d5f70c65..a9dbc3f12c428ff4e86932ad1eb29448b9290812 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.15.0-rc0
+DEF_VER=v2.15.0
 
 LF='
 '