From 34d2b54db29ec5878f98f5f4c5f2a077946f1b93 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 22 Apr 2010 22:46:01 +0200 Subject: sync busybox config --- package/busybox/config/editors/Config.in | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'package/busybox/config/editors') diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in index 2d04fe99b..3ebb16a6f 100644 --- a/package/busybox/config/editors/Config.in +++ b/package/busybox/config/editors/Config.in @@ -36,13 +36,12 @@ config BUSYBOX_DIFF differences between them in a form that can be given to the patch command. -config BUSYBOX_FEATURE_DIFF_BINARY - bool "Enable checks for binary files" - default y - depends on BUSYBOX_DIFF +config BUSYBOX_FEATURE_DIFF_LONG_OPTIONS + bool "Enable long options" + default n + depends on BUSYBOX_DIFF && BUSYBOX_LONG_OPTS help - This option enables support for checking for binary files - before a comparison is carried out. + Enable use of long options. config BUSYBOX_FEATURE_DIFF_DIR bool "Enable directory support" @@ -52,14 +51,6 @@ config BUSYBOX_FEATURE_DIFF_DIR This option enables support for directory and subdirectory comparison. -config BUSYBOX_FEATURE_DIFF_MINIMAL - bool "Enable -d option to find smaller sets of changes" - default n - depends on BUSYBOX_DIFF - help - Enabling this option allows the use of -d to make diff - try hard to find the smallest possible set of changes. - config BUSYBOX_ED bool "ed" default n -- cgit v1.2.3