mirror of
https://git.FreeBSD.org/src.git
synced 2026-06-02 11:24:32 +00:00
diff3: use bsd diff3 by default
This commit is contained in:
@@ -102,7 +102,6 @@ __DEFAULT_YES_OPTIONS = \
|
||||
FREEBSD_UPDATE \
|
||||
FTP \
|
||||
GAMES \
|
||||
GNU_DIFF \
|
||||
GOOGLETEST \
|
||||
GPIO \
|
||||
HAST \
|
||||
@@ -209,6 +208,7 @@ __DEFAULT_NO_OPTIONS = \
|
||||
DTRACE_ASAN \
|
||||
DTRACE_TESTS \
|
||||
EXPERIMENTAL \
|
||||
GNU_DIFF \
|
||||
HESIOD \
|
||||
IPFILTER_IPFS \
|
||||
LOADER_VERBOSE \
|
||||
|
||||
Reference in New Issue
Block a user