Make diff(1) follow traditional UNIX SOP of later options nullify earlier

options that are mutually exclusive.
2005-06-03 06:46:56 +00:00 · 2005-06-03 06:46:56 +00:00 · a1ccaaff09
commit a1ccaaff09
parent 44e5f34aa2
1 changed files with 0 additions and 3 deletions
--- 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;
 }