rename merge conflict test repo

This commit is contained in:
Jesse Duffield 2018-08-12 11:05:21 +10:00
parent 8f6329c402
commit 2b3bdc8b8f

View file

@ -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}