@@ -99,15 +99,15 @@ private MergePr(String[] args) {
9999
100100 private static void printUsage () {
101101 System .err .println ("Usage: java dev/merge-pr.java [flags]" );
102- System .err .println (" --pr int Pull request number (required)" );
103- System .err .println (" --target string Target branch (default: PR base branch)" );
104- System .err .println (" --fix-versions value JIRA fix version(s), comma-separated" );
105- System .err .println (" --release-branches value Release branch(es) to cherry-pick into, comma-separated" );
106- System .err .println (" --resolve-jira Resolve associated JIRA issue(s)" );
107- System .err .println (" --dry-run Show what would be done without making changes" );
108- System .err .println (" --push-remote string Git remote for pushing (default: apache)" );
109- System .err .println (" --github-token string GitHub OAuth token (env: GITHUB_OAUTH_KEY)" );
110- System .err .println (" --jira-token string JIRA access token (env: JIRA_ACCESS_TOKEN)" );
102+ System .err .println (" --pr int Pull request number (required)" );
103+ System .err .println (" --target string Target branch (default: PR base branch)" );
104+ System .err .println (" --fix-versions value JIRA fix version(s), comma-separated" );
105+ System .err .println (" --release-branches value Release branch(es) to cherry-pick into, comma-separated" );
106+ System .err .println (" --resolve-jira Resolve associated JIRA issue(s)" );
107+ System .err .println (" --dry-run Show what would be done without making changes" );
108+ System .err .println (" --push-remote string Git remote for pushing (default: apache)" );
109+ System .err .println (" --github-token string GitHub OAuth token (env: GITHUB_OAUTH_KEY)" );
110+ System .err .println (" --jira-token string JIRA access token (env: JIRA_ACCESS_TOKEN)" );
111111 }
112112
113113 private static List <String > parseCsv (String value ) {
0 commit comments