src/contrib/diff, branch main FreeBSD source tree Retire GNU diff3 2026-02-22T01:53:19+00:00 Ed Maste emaste@FreeBSD.org 2024-10-02T16:30:57+00:00 9a44e42a2b8f5f78695016344e760d72ad0b1220 We added the option to build BSD diff3 in commit 2201f7c49f11 ("Build BSD diff3 if GNU diff3 is disabled.") and made it the default in 4d5c434ed16e ("diff3: use bsd diff3 by default") after resolving deficiencies relative to GNU diff3. Thus, we can now remove the GNU diff3 build infrastructure and source. Reviewed by: bapt, ziaee Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46878 
We added the option to build BSD diff3 in commit 2201f7c49f11 ("Build
BSD diff3 if GNU diff3 is disabled.") and made it the default in
4d5c434ed16e ("diff3: use bsd diff3 by default") after resolving
deficiencies relative to GNU diff3.  Thus, we can now remove the GNU
diff3 build infrastructure and source.

Reviewed by:	bapt, ziaee
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46878
diff3: Use a format string to quiet a compiler warning 2026-02-13T20:19:58+00:00 Ed Maste emaste@FreeBSD.org 2025-11-18T13:21:03+00:00 fd52a9becc62f721ad6a61c7301559afaedee010 And bump WARNS to 2 
And bump WARNS to 2
diff3: Use logical-not, not bitwise for booleans 2025-11-18T18:53:24+00:00 Ed Maste emaste@FreeBSD.org 2025-11-18T13:20:40+00:00 abcb80f46c2607fc16564ca87cc25f0908f29f99 And compare impcompat != 0 as it's actually an integer incremented on each use of one of the AeExX3 options. Reviewed by: fuz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53808 
And compare impcompat != 0 as it's actually an integer incremented on
each use of one of the AeExX3 options.

Reviewed by:	fuz
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D53808
diff3: Remove bespoke getopt.h 2025-11-18T13:42:36+00:00 Ed Maste emaste@FreeBSD.org 2025-11-18T13:16:22+00:00 38829592dc77e9ead4259785e0bfb93bd4c2fe34 diff3's getopt.h included a function declaration without a prototype, which produces a compiler warning. Just remove the bespoke getopt.h and use the system header. Reported by: Mark Millard Reviewed by: fuz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53802 
diff3's getopt.h included a function declaration without a prototype,
which produces a compiler warning.  Just remove the bespoke getopt.h
and use the system header.

Reported by:	Mark Millard
Reviewed by:	fuz
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D53802
contrib: Remove various $FreeBSD$ tags not upstream 2024-05-31T19:49:17+00:00 Warner Losh imp@FreeBSD.org 2024-05-31T19:49:17+00:00 d37eb51047221dc3322b34db1038ff3aa533883f Sponsored by: Netflix 
Sponsored by:		Netflix
gnu diff3: apply patch to committed src, rather than at build time 2022-11-14T02:33:40+00:00 Ed Maste emaste@FreeBSD.org 2022-11-11T19:48:40+00:00 3a13b5ac83a100ebb5a0da0579e418f19b3b630b This appears to be a leftover from the time we used a less-capable VCS. Reviewed by: delphij MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37368 
This appears to be a leftover from the time we used a less-capable VCS.

Reviewed by:	delphij
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D37368
Fix macro-redefined warning in gnu/diff for fputc_unlocked 2021-01-19T21:23:25+00:00 Alex Richardson arichardson@FreeBSD.org 2021-01-19T11:35:15+00:00 7954ad9f22b3b453c4cea49dc663e7b17631a209 While updating config.h to set HAVE_DECL_FPUTC_UNLOCKED to 1 also update the other macros that are defined in stdio.h. 
While updating config.h to set HAVE_DECL_FPUTC_UNLOCKED to 1 also update
the other macros that are defined in stdio.h.
Fix the wrong format, format specifies type 'int' but the argument has type 2015-06-01T06:14:17+00:00 Marcelo Araujo araujo@FreeBSD.org 2015-06-01T06:14:17+00:00 9310c7d568363767c06ec1aa2255c313e70f54bc 'long', it was spotted by clang. Differential Revision: D2663 Reviewed by: imp, rodrigc 
'long', it was spotted by clang.

Differential Revision:	D2663
Reviewed by:		imp, rodrigc
Convert texinfo to mdoc(7) using texi2mdoc 2015-03-02T11:48:00+00:00 Baptiste Daroussin bapt@FreeBSD.org 2015-03-02T11:48:00+00:00 2fd5d19071f68264b1d432b77bc38239c8b2aa40 






Fix a cut and paste error.
2014-01-05T23:28:03+00:00

Warren Block
wblock@FreeBSD.org

2014-01-05T23:28:03+00:00

998db43a8d31330a111205a1bba9707883de8610

PR:		docs/184791
Submitted by:	Jamie Landeg Jones <jamie@dyslexicfish.net>
MFC after:	3 days





PR:		docs/184791
Submitted by:	Jamie Landeg Jones <jamie@dyslexicfish.net>
MFC after:	3 days