From 28832e4b7973c204037046cf2ec4de97b81dcce0 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Fri, 3 Jun 2005 06:46:56 +0000
Subject: [PATCH] Make diff(1) follow traditional UNIX SOP of later options
 nullify earlier options that are mutually exclusive.

---
 contrib/diff/diff.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/contrib/diff/diff.c b/contrib/diff/diff.c
index 4400642ac88e..1f5f842d2e93 100644
--- a/contrib/diff/diff.c
+++ b/contrib/diff/diff.c
@@ -785,9 +785,6 @@ static void
 specify_style (style)
      enum output_style style;
 {
-  if (output_style != OUTPUT_NORMAL
-      && output_style != style)
-    error ("conflicting specifications of output style", 0, 0);
   output_style = style;
 }