diff options
author | Nicolas Thill <nico@openwrt.org> | 2010-04-03 00:58:46 +0000 |
---|---|---|
committer | Nicolas Thill <nico@openwrt.org> | 2010-04-03 00:58:46 +0000 |
commit | 2e6a62c2d43b3794a3e48db637c4caa2f8c2f5a4 (patch) | |
tree | d07bb9a053f23756c5eed4761088f44d8b555235 /package/busybox/config/editors/Config.in | |
parent | 228f345ff16286682df56a56113cbe62cb52125c (diff) | |
download | upstream-2e6a62c2d43b3794a3e48db637c4caa2f8c2f5a4.tar.gz upstream-2e6a62c2d43b3794a3e48db637c4caa2f8c2f5a4.tar.bz2 upstream-2e6a62c2d43b3794a3e48db637c4caa2f8c2f5a4.zip |
[package] busybox: update to v1.16.1 (based on v1.16.0 update patch from Peter Wagner)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20661 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox/config/editors/Config.in')
-rw-r--r-- | package/busybox/config/editors/Config.in | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in index 9eb85bbb87..6175df72fc 100644 --- a/package/busybox/config/editors/Config.in +++ b/package/busybox/config/editors/Config.in @@ -35,13 +35,12 @@ config BUSYBOX_CONFIG_DIFF differences between them in a form that can be given to the patch command. -config BUSYBOX_CONFIG_FEATURE_DIFF_BINARY - bool "Enable checks for binary files" +config BUSYBOX_CONFIG_FEATURE_DIFF_LONG_OPTIONS + bool "Enable long options" default n - depends on BUSYBOX_CONFIG_DIFF + depends on BUSYBOX_CONFIG_DIFF && BUSYBOX_CONFIG_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_CONFIG_FEATURE_DIFF_DIR bool "Enable directory support" @@ -51,14 +50,6 @@ config BUSYBOX_CONFIG_FEATURE_DIFF_DIR This option enables support for directory and subdirectory comparison. -config BUSYBOX_CONFIG_FEATURE_DIFF_MINIMAL - bool "Enable -d option to find smaller sets of changes" - default n - depends on BUSYBOX_CONFIG_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_CONFIG_ED bool "ed" default n |