rename merge conflict test repo

2025-02-25 18:55:28 -06:00 · 2018-08-12 11:05:21 +10:00
parent 8f6329c402
commit 2b3bdc8b8f
1 changed files with 1 additions and 1 deletions
--- a/test/merge_conflict.sh
+++ b/test/merge_conflict.sh
@@ -10,7 +10,7 @@
 # -x means print out simple commands before running them
 set -ex

-reponame="testrepo"
+reponame="merge_conflict"

 rm -rf ${reponame}
 mkdir ${reponame}