diff options
| author | obrien <obrien@FreeBSD.org> | 2005-06-03 06:46:56 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2005-06-03 06:46:56 +0000 |
| commit | a1ccaaff09bd9d4f15c89142a2116efad5eb43a7 (patch) | |
| tree | 91e54cccce92801acd21199e9c0a227ea7a5ec0c /contrib/diff | |
| parent | 44e5f34aa2d5064f714b8ea212f60bcf7f0b9a96 (diff) | |
| download | FreeBSD-src-a1ccaaff09bd9d4f15c89142a2116efad5eb43a7.zip FreeBSD-src-a1ccaaff09bd9d4f15c89142a2116efad5eb43a7.tar.gz | |
Make diff(1) follow traditional UNIX SOP of later options nullify earlier
options that are mutually exclusive.
Diffstat (limited to 'contrib/diff')
| -rw-r--r-- | contrib/diff/diff.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/contrib/diff/diff.c b/contrib/diff/diff.c index 4400642..1f5f842 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; } |
