aboutsummaryrefslogtreecommitdiff
path: root/contrib/diff/diff.c
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2005-07-07 22:55:40 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2005-07-07 22:55:40 +0000
commitacc961c87302dbd5826ddca415ba32ac13fb2d30 (patch)
tree3c331f91c462b544ef4f6a598ac3839097742eee /contrib/diff/diff.c
parent5160e33f118d18926e7c0242161672f0bff2802e (diff)
Notes
Diffstat (limited to 'contrib/diff/diff.c')
-rw-r--r--contrib/diff/diff.c3
1 files changed, 0 insertions, 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;
}