From 0f2b48dd6257a33458c126bf033e39059ce0fe0d Mon Sep 17 00:00:00 2001
From: Dan Davison <dandavison7@gmail.com>
Date: Wed, 19 Jan 2022 08:18:41 -0500
Subject: Prevent clap from switching to multiline format for short help

Ref https://github.com/clap-rs/clap/issues/3300
Fixes #377
---
 src/cli.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/cli.rs')

diff --git a/src/cli.rs b/src/cli.rs
index 233adc9..88785c8 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -20,6 +20,7 @@ use crate::utils::bat::output::PagingMode;
     version,
     color = ColorChoice::Always,
     setting(AppSettings::DeriveDisplayOrder),
+    term_width(usize::MAX),
     after_long_help = "\
 GIT CONFIG
 ----------
@@ -729,8 +730,7 @@ pub struct Opt {
     #[clap(
         long = "merge-conflict-theirs-diff-header-decoration-style",
         default_value = "box",
-        // See https://github.com/clap-rs/clap/issues/3300
-        value_name = "STYLE>                            "
+        value_name = "STYLE"
     )]
     /// Style string for the decoration of the header above the 'theirs' merge conflict diff.
     ///
-- 
cgit v1.2.3