From 8318a9b544627ccc0dc2e41db5990524e05f542f Mon Sep 17 00:00:00 2001
From: Yoli Hodde <yoli.hodde@automattic.com>
Date: Thu, 21 Nov 2024 11:05:52 -0800
Subject: [PATCH] Resolving conflict

---
 src/bin/vip-logs.js     | 8 +++-----
 src/bin/vip-slowlogs.ts | 5 +----
 src/lib/cli/command.js  | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/bin/vip-logs.js b/src/bin/vip-logs.js
index 08b0bb3a7..7b0ff786a 100755
--- a/src/bin/vip-logs.js
+++ b/src/bin/vip-logs.js
@@ -234,7 +234,8 @@ command( {
 } )
 	.option(
 		'type',
-		'Specify the type of Runtime Logs to retrieve. Accepts "batch" (only valid for WordPress environments) or "app" (default).'
+		'Specify the type of Runtime Logs to retrieve. Accepts "batch" (only valid for WordPress environments).',
+		'app'
 	)
 	// The default limit is set manually in the validateInputs function to address validation issues, avoiding incorrect replacement of the default value.
 	.option(
@@ -242,10 +243,7 @@ command( {
 		`The maximum number of entries to return. Accepts an integer value between 1 and 5000 (defaults to ${ LIMIT_DEFAULT }).`
 	)
 	.option( 'follow', 'Output new entries as they are generated.' )
-	.option(
-		'format',
-		'Render output in a particular format. Accepts "table" (default), "csv", and "json".'
-	)
+	.option( 'format', 'Render output in a particular format. Accepts “csv”, and “json”.', 'table' )
 	.examples( [
 		{
 			usage: 'vip @example-app.production logs',
diff --git a/src/bin/vip-slowlogs.ts b/src/bin/vip-slowlogs.ts
index 635892f6b..4b84f897c 100755
--- a/src/bin/vip-slowlogs.ts
+++ b/src/bin/vip-slowlogs.ts
@@ -199,10 +199,7 @@ void command( {
 		'Set the maximum number of log entries. Accepts an integer value between 1 and 500.',
 		500
 	)
-	.option(
-		'format',
-		'Render output in a particular format. Accepts “table” (default), “csv”, and “json”.'
-	)
+	.option( 'format', 'Render output in a particular format. Accepts “csv”, and “json”.', 'table' )
 	.examples( [
 		{
 			description:
diff --git a/src/lib/cli/command.js b/src/lib/cli/command.js
index f5a089620..5d3138f4f 100644
--- a/src/lib/cli/command.js
+++ b/src/lib/cli/command.js
@@ -603,7 +603,7 @@ export default function ( opts ) {
 	if ( _opts.format ) {
 		args.option(
 			'format',
-			'Render output in a particular format. Accepts “table” (default), “csv”, and “json”.',
+			'Render output in a particular format. Accepts “csv”, and “json”.',
 			'table'
 		);
 	}