diff3: use bsd diff3 by default
This commit is contained in:
@@ -102,7 +102,6 @@ __DEFAULT_YES_OPTIONS = \
|
|||||||
FREEBSD_UPDATE \
|
FREEBSD_UPDATE \
|
||||||
FTP \
|
FTP \
|
||||||
GAMES \
|
GAMES \
|
||||||
GNU_DIFF \
|
|
||||||
GOOGLETEST \
|
GOOGLETEST \
|
||||||
GPIO \
|
GPIO \
|
||||||
HAST \
|
HAST \
|
||||||
@@ -209,6 +208,7 @@ __DEFAULT_NO_OPTIONS = \
|
|||||||
DTRACE_ASAN \
|
DTRACE_ASAN \
|
||||||
DTRACE_TESTS \
|
DTRACE_TESTS \
|
||||||
EXPERIMENTAL \
|
EXPERIMENTAL \
|
||||||
|
GNU_DIFF \
|
||||||
HESIOD \
|
HESIOD \
|
||||||
IPFILTER_IPFS \
|
IPFILTER_IPFS \
|
||||||
LOADER_VERBOSE \
|
LOADER_VERBOSE \
|
||||||
|
|||||||
Reference in New Issue
Block a user