src/contrib/diff/doc, 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
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 






This commit was generated by cvs2svn to compensate for changes in r171490,
2007-07-19T06:57:46+00:00

Xin LI
delphij@FreeBSD.org

2007-07-19T06:57:46+00:00

3abc9103eb34adbb48853f2361206eba207d6c4f

which included commits to RCS files with non-trunk default branches.





which included commits to RCS files with non-trunk default branches.







Apply vendor patch that implements 1/2 as aliases of l/r.
2007-06-15T07:49:35+00:00

Xin LI
delphij@FreeBSD.org

2007-06-15T07:49:35+00:00

b61bbb7026016898470bf42988a884e09d8229f5

Requested by:   dmalone, Chuck Swiger





Requested by:   dmalone, Chuck Swiger







Virgin import of diffutils 2.8.7.
2007-06-15T07:06:13+00:00

Xin LI
delphij@FreeBSD.org

2007-06-15T07:06:13+00:00

18fd37a72c3a7549d2d4f6c6ea00bdcd2bdaca01