Date: Sat, 14 Nov 2020 01:00:43 +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-QO47KoAYQk@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 #9 from commit-hook@FreeBSD.org --- A commit references this bug: Author: kevans Date: Sat Nov 14 00:59:55 UTC 2020 New revision: 367656 URL: https://svnweb.freebsd.org/changeset/base/367656 Log: MFC r367076: 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 Changes: _U stable/12/ stable/12/usr.bin/diff/diff.c --=20 You are receiving this mail because: You are on the CC list for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-250015-227-QO47KoAYQk>