rename merge conflict test repo

markiv · Aug 12, 2018 · 2b3bdc8 · 2b3bdc8
1 parent 8f6329c
commit 2b3bdc8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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}