diff options
| -rwxr-xr-x | test/merge_conflict.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/merge_conflict.sh b/test/merge_conflict.sh index 9bd12bf56..f255640b3 100755 --- 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} |