summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/cli.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cli.rs b/src/cli.rs
index 9f0abf7a..cdd85964 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -728,9 +728,9 @@ pub struct Opt {
#[clap(
long = "merge-conflict-theirs-diff-header-decoration-style",
- default_value = "box"
+ 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.
///