diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2018-08-12 11:05:21 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-08-12 11:05:21 +1000 |
| commit | 2b3bdc8b8ff2a7391796acc692e994b309a2fa0a (patch) | |
| tree | 0ba49cf0f891a05a063c473e4ec06df950c12c54 /test | |
| parent | 8f6329c402eb7368c63453e8f2593074394bf223 (diff) | |
rename merge conflict test repo
Diffstat (limited to 'test')
| -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} |