[Bug 243975] diff(1) should print the usage information when two different formatting options are used at the same time

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=243975

--- Comment #4 from commit-hook at freebsd.org ---
A commit references this bug:

Author: kevans
Date: Mon Apr 27 22:32:16 UTC 2020
New revision: 360403
URL: https://svnweb.freebsd.org/changeset/base/360403

Log:
  MFC r360125: diff(1): reject conflicting formatting options

  This matches GNU diff(1) behavior and, more importantly, eliminates any
  source of confusion if multiple formatting options are specified.

  Note that the committed diff differs slightly from the submitted: I've
  modified it so that we initialize diff_format to something that isn't an
  accepted format option so that we can also reject --normal -c and -c
  --normal, which would've otherwise been accepted because the default was
  --normal. After option parsing we default it to D_NORMAL if it's still
  unset.

  PR:           243975

Changes:
_U  stable/12/
  stable/12/usr.bin/diff/diff.c
  stable/12/usr.bin/diff/diff.h
  stable/12/usr.bin/diff/tests/diff_test.sh

-- 
You are receiving this mail because:
You are on the CC list for the bug.