[Bug 250015] diff -purw fails with 'error: conflicting output format options.'

[bugzilla-noreply at freebsd.org]

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

--- Comment #5 from commit-hook at FreeBSD.org ---
A commit references this bug:

Author: kevans
Date: Tue Oct 27 12:27:26 UTC 2020
New revision: 367076
URL: https://svnweb.freebsd.org/changeset/base/367076

Log:
  diff: don't force the format to 'context' with -p immediately

  Instead, leave the fomat as unspecified (if it hasn't been) and use the
  -p flag as a hint to 'context' if no other formatting option is specified.

  This fixes `diff -purw`, used frequently by emaste, and matches the behavior
  of its GNU counterpart.

  PR:           250015
  Reviewed by:  emaste
  MFC after:    1 week

Changes:
  head/usr.bin/diff/diff.c

-- 
You are receiving this mail because:
You are the assignee for the bug.