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/split.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/split.c')
-rw-r--r-- | coreutils/split.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/coreutils/split.c b/coreutils/split.c index f0077077e..11e640442 100644 --- a/coreutils/split.c +++ b/coreutils/split.c | |||
@@ -13,8 +13,7 @@ | |||
13 | //usage:#define split_trivial_usage | 13 | //usage:#define split_trivial_usage |
14 | //usage: "[OPTIONS] [INPUT [PREFIX]]" | 14 | //usage: "[OPTIONS] [INPUT [PREFIX]]" |
15 | //usage:#define split_full_usage "\n\n" | 15 | //usage:#define split_full_usage "\n\n" |
16 | //usage: "Options:" | 16 | //usage: " -b N[k|m] Split by N (kilo|mega)bytes" |
17 | //usage: "\n -b N[k|m] Split by N (kilo|mega)bytes" | ||
18 | //usage: "\n -l N Split by N lines" | 17 | //usage: "\n -l N Split by N lines" |
19 | //usage: "\n -a N Use N letters as suffix" | 18 | //usage: "\n -a N Use N letters as suffix" |
20 | //usage: | 19 | //usage: |