@@ -104,6 +104,8 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
104104 .use_delimiter(false)
105105 .takes_value(true)
106106 .overrides_with("style")
107+ .overrides_with("plain")
108+ .overrides_with("number")
107109 // Cannot use clap's built in validation because we have to turn off clap's delimiters
108110 .validator(|val| {
109111 let mut invalid_vals = val.split(",").filter(|style| {
@@ -136,10 +138,10 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
136138 .arg(
137139 Arg::with_name("plain")
138140 .overrides_with("plain")
141+ .overrides_with("number")
139142 .short("p")
140143 .long("plain")
141− .conflicts_with("style")
142− .conflicts_with("number")
144+ // .conflicts_with("style")
143145 .help("Show plain style (alias for '--style=plain').")
144146 .long_help(
145147 "Only show plain style, no decorations. This is an alias for \
@@ -151,7 +153,6 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
151153 .long("number")
152154 .overrides_with("number")
153155 .short("n")
154− .conflicts_with("style")
155156 .help("Show line numbers (alias for '--style=numbers').")
156157 .long_help(
157158 "Only show line numbers, no other decorations. This is an alias for \