diff options
author | Ron Yorston <rmy@pobox.com> | 2017-09-27 10:08:12 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2017-09-27 10:11:19 +0100 |
commit | d9383e984da8de72e61e5094a3cf6404c5707ddc (patch) | |
tree | dd42825854fc42aea40d4f7a95548d53721d1733 /editors/diff.c | |
parent | 166b3e4e82799f87d3b002c7177891111eff079e (diff) | |
parent | 0c4dbd481aedb5d22c1048e7f7eb547a3b5e50a5 (diff) | |
download | busybox-w32-d9383e984da8de72e61e5094a3cf6404c5707ddc.tar.gz busybox-w32-d9383e984da8de72e61e5094a3cf6404c5707ddc.tar.bz2 busybox-w32-d9383e984da8de72e61e5094a3cf6404c5707ddc.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'editors/diff.c')
-rw-r--r-- | editors/diff.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/editors/diff.c b/editors/diff.c index 1ff399ffb..beea3e618 100644 --- a/editors/diff.c +++ b/editors/diff.c | |||
@@ -12,7 +12,6 @@ | |||
12 | * | 12 | * |
13 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 13 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
14 | */ | 14 | */ |
15 | |||
16 | /* | 15 | /* |
17 | * The following code uses an algorithm due to Harold Stone, | 16 | * The following code uses an algorithm due to Harold Stone, |
18 | * which finds a pair of longest identical subsequences in | 17 | * which finds a pair of longest identical subsequences in |
@@ -75,7 +74,6 @@ | |||
75 | * 3*(number of k-candidates installed), typically about | 74 | * 3*(number of k-candidates installed), typically about |
76 | * 6n words for files of length n. | 75 | * 6n words for files of length n. |
77 | */ | 76 | */ |
78 | |||
79 | //config:config DIFF | 77 | //config:config DIFF |
80 | //config: bool "diff (13 kb)" | 78 | //config: bool "diff (13 kb)" |
81 | //config: default y | 79 | //config: default y |
@@ -97,10 +95,10 @@ | |||
97 | //config: This option enables support for directory and subdirectory | 95 | //config: This option enables support for directory and subdirectory |
98 | //config: comparison. | 96 | //config: comparison. |
99 | 97 | ||
100 | //kbuild:lib-$(CONFIG_DIFF) += diff.o | ||
101 | |||
102 | //applet:IF_DIFF(APPLET(diff, BB_DIR_USR_BIN, BB_SUID_DROP)) | 98 | //applet:IF_DIFF(APPLET(diff, BB_DIR_USR_BIN, BB_SUID_DROP)) |
103 | 99 | ||
100 | //kbuild:lib-$(CONFIG_DIFF) += diff.o | ||
101 | |||
104 | //usage:#define diff_trivial_usage | 102 | //usage:#define diff_trivial_usage |
105 | //usage: "[-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2" | 103 | //usage: "[-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2" |
106 | //usage:#define diff_full_usage "\n\n" | 104 | //usage:#define diff_full_usage "\n\n" |