Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 Oct 2020 12:27:34 +0000
From:      bugzilla-noreply@freebsd.org
To:        bugs@FreeBSD.org
Subject:   [Bug 250015] diff -purw fails with 'error: conflicting output format options.'
Message-ID:  <bug-250015-227-N49I5R1rt0@https.bugs.freebsd.org/bugzilla/>
In-Reply-To: <bug-250015-227@https.bugs.freebsd.org/bugzilla/>
References:  <bug-250015-227@https.bugs.freebsd.org/bugzilla/>

next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D250015

--- Comment #5 from commit-hook@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 behav=
ior
  of its GNU counterpart.

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

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

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-250015-227-N49I5R1rt0>