]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
MFC r367076: diff: don't force the format to 'context' with -p immediately
authorKyle Evans <kevans@FreeBSD.org>
Sat, 14 Nov 2020 00:59:55 +0000 (00:59 +0000)
committerKyle Evans <kevans@FreeBSD.org>
Sat, 14 Nov 2020 00:59:55 +0000 (00:59 +0000)
commit4292187033f17271a718b6c9fac507688ad870a9
tree6cb6bd8f66d17e501b82138c29d3a31625cfab13
parentcf8b5ae0d1c3a6df44864cd8bdb92fd2bb55fa42
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 behavior
of its GNU counterpart.

PR: 250015
usr.bin/diff/diff.c