git: 696db1d8624f - stable/12 - Update GNU_DIFF knob descriptions

Ed Maste emaste at FreeBSD.org
Tue Dec 29 19:15:54 UTC 2020


The branch stable/12 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=696db1d8624f7491e9ada5b1b162ea70fe88aa98

commit 696db1d8624f7491e9ada5b1b162ea70fe88aa98
Author:     Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2020-05-20 17:20:48 +0000
Commit:     Ed Maste <emaste at FreeBSD.org>
CommitDate: 2020-12-29 19:15:31 +0000

    Update GNU_DIFF knob descriptions
    
    After r317209 the WITH_/WITHOUT_GNU_DIFF knob controls only diff3;
    diff is always BSD diff.
    
    MFC after:      1 week
    
    (cherry picked from commit e578c8c3b51fdfa8dd4eafd113457d516d447984)
---
 tools/build/options/WITHOUT_GNU_DIFF | 2 --
 tools/build/options/WITH_GNU_DIFF    | 2 --
 2 files changed, 4 deletions(-)

diff --git a/tools/build/options/WITHOUT_GNU_DIFF b/tools/build/options/WITHOUT_GNU_DIFF
index de8667fe4d73..48d7361ff8ca 100644
--- a/tools/build/options/WITHOUT_GNU_DIFF
+++ b/tools/build/options/WITHOUT_GNU_DIFF
@@ -1,5 +1,3 @@
 .\" $FreeBSD$
 Set to not build GNU
-.Xr diff 1
-and
 .Xr diff3 1 .
diff --git a/tools/build/options/WITH_GNU_DIFF b/tools/build/options/WITH_GNU_DIFF
index 3741e440a9ba..41827190aa94 100644
--- a/tools/build/options/WITH_GNU_DIFF
+++ b/tools/build/options/WITH_GNU_DIFF
@@ -1,5 +1,3 @@
 .\" $FreeBSD$
 Build and install GNU
-.Xr diff 1
-and
 .Xr diff3 1 .


More information about the dev-commits-src-all mailing list