diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2017-08-15 11:20:11 -0300 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2017-08-15 11:20:11 -0300 |
| commit | 35c9a75eff464ff7bb0e58c67488a6fa1bdebaaa (patch) | |
| tree | b78097fd10cad31f45b8b6613d45960f2872802c /scripts/merge-reports | |
| parent | 0112d13314e1aea350c7dacc02c0f1c527566809 (diff) | |
| parent | fe09c25d68a61c5874e9beb0f018c05a4d789d70 (diff) | |
| download | gitlab-ce-docs-topic-permissions.tar.gz | |
fix conflictdocs-topic-permissions
Diffstat (limited to 'scripts/merge-reports')
| -rwxr-xr-x | scripts/merge-reports | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/merge-reports b/scripts/merge-reports index aad76bcc327..3a421f1f1fc 100755 --- a/scripts/merge-reports +++ b/scripts/merge-reports @@ -4,7 +4,7 @@ require 'json' main_report_file = ARGV.shift unless main_report_file - puts 'usage: merge_reports <main-report> [extra reports...]' + puts 'usage: merge-reports <main-report> [extra reports...]' exit 1 end |