git: 77fd02501f09 - main - src.conf.5: regen after diff3 changes
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 04 Oct 2024 23:06:35 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=77fd02501f0966ef54eb4a42e086a61a48134c42
commit 77fd02501f0966ef54eb4a42e086a61a48134c42
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-10-04 22:01:03 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-10-04 22:01:03 +0000
src.conf.5: regen after diff3 changes
Fixes: 2201f7c49f11 Build BSD diff3 if GNU diff3 is disabled.
---
share/man/man5/src.conf.5 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index c259e05af807..72ca14b8eae8 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,5 +1,5 @@
.\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
-.Dd September 26, 2024
+.Dd October 4, 2024
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -720,7 +720,10 @@ and
programs instead of the enhanced versions.
.It Va WITHOUT_GNU_DIFF
Do not build GNU
-.Xr diff3 1 .
+.Xr diff3 1 ;
+build BSD
+.Xr diff3 1
+instead.
.It Va WITHOUT_GOOGLETEST
Neither build nor install
.Lb libgmock ,