From 16de47920cb14d03a1ed5d851a9f5283472d3d7c Mon Sep 17 00:00:00 2001
From: Andrew Gallant <jamslam@gmail.com>
Date: Sat, 18 Feb 2017 15:25:08 -0500
Subject: [PATCH] Permit --heading to override --no-heading.

@kbknapp <3

Fixes #327
---
 src/app.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app.rs b/src/app.rs
index e8ceeb56..9ead9c5b 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -135,8 +135,8 @@ fn app<F>(next_line_help: bool, doc: F) -> App<'static, 'static>
         .arg(flag("files-without-match"))
         .arg(flag("with-filename").short("H"))
         .arg(flag("no-filename"))
-        .arg(flag("heading"))
-        .arg(flag("no-heading"))
+        .arg(flag("heading").overrides_with("no-heading"))
+        .arg(flag("no-heading").overrides_with("heading"))
         .arg(flag("hidden"))
         .arg(flag("ignore-file")
              .value_name("FILE").takes_value(true)