aboutsummaryrefslogtreecommitdiff
path: root/editors/diff.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2017-07-24 11:40:28 +0100
committerRon Yorston <rmy@pobox.com>2017-07-24 12:03:28 +0100
commit60411636073cdc08e8005f0de00098e6dd00eaf5 (patch)
tree58673b64af1e663280be81f798c8f66ce116d1dd /editors/diff.c
parenteeceafbc5c4caf513c6d92b7d71ecb0ccd89a3f8 (diff)
parentb72f1ef17b97802d33f0ac522f64bea0f65442c5 (diff)
downloadbusybox-w32-60411636073cdc08e8005f0de00098e6dd00eaf5.tar.gz
busybox-w32-60411636073cdc08e8005f0de00098e6dd00eaf5.tar.bz2
busybox-w32-60411636073cdc08e8005f0de00098e6dd00eaf5.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'editors/diff.c')
-rw-r--r--editors/diff.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/editors/diff.c b/editors/diff.c
index 975bc4603..62f558944 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -77,12 +77,12 @@
77 */ 77 */
78 78
79//config:config DIFF 79//config:config DIFF
80//config: bool "diff" 80//config: bool "diff (13 kb)"
81//config: default y 81//config: default y
82//config: help 82//config: help
83//config: diff compares two files or directories and outputs the 83//config: diff compares two files or directories and outputs the
84//config: differences between them in a form that can be given to 84//config: differences between them in a form that can be given to
85//config: the patch command. 85//config: the patch command.
86//config: 86//config:
87//config:config FEATURE_DIFF_LONG_OPTIONS 87//config:config FEATURE_DIFF_LONG_OPTIONS
88//config: bool "Enable long options" 88//config: bool "Enable long options"
@@ -94,8 +94,8 @@
94//config: default y 94//config: default y
95//config: depends on DIFF 95//config: depends on DIFF
96//config: help 96//config: help
97//config: This option enables support for directory and subdirectory 97//config: This option enables support for directory and subdirectory
98//config: comparison. 98//config: comparison.
99 99
100//kbuild:lib-$(CONFIG_DIFF) += diff.o 100//kbuild:lib-$(CONFIG_DIFF) += diff.o
101 101