diff options
author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
commit | 1118c95535ea51961437089fc3dece5ab4ea7e1b (patch) | |
tree | 1515bd2376a6d6c5123791662307ce2ed90cdf36 /coreutils/wc.c | |
parent | 0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (diff) | |
parent | 066f39956641300c1e5c6bfe6c11a115cea3e2cf (diff) | |
download | busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.gz busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.bz2 busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.zip |
Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge
Conflicts:
procps/ps.c
Diffstat (limited to 'coreutils/wc.c')
-rw-r--r-- | coreutils/wc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/coreutils/wc.c b/coreutils/wc.c index 6e22c66c8..a410e407a 100644 --- a/coreutils/wc.c +++ b/coreutils/wc.c | |||
@@ -64,7 +64,6 @@ | |||
64 | //usage: | 64 | //usage: |
65 | //usage:#define wc_full_usage "\n\n" | 65 | //usage:#define wc_full_usage "\n\n" |
66 | //usage: "Count lines, words, and bytes for each FILE (or stdin)\n" | 66 | //usage: "Count lines, words, and bytes for each FILE (or stdin)\n" |
67 | //usage: "\nOptions:" | ||
68 | //usage: "\n -c Count bytes" | 67 | //usage: "\n -c Count bytes" |
69 | //usage: IF_UNICODE_SUPPORT( | 68 | //usage: IF_UNICODE_SUPPORT( |
70 | //usage: "\n -m Count characters" | 69 | //usage: "\n -m Count characters" |