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/expand.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/expand.c')
| -rw-r--r-- | coreutils/expand.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/coreutils/expand.c b/coreutils/expand.c index 73ab0ece3..25bbffc66 100644 --- a/coreutils/expand.c +++ b/coreutils/expand.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | //usage: "[-i] [-t N] [FILE]..." | 25 | //usage: "[-i] [-t N] [FILE]..." |
| 26 | //usage:#define expand_full_usage "\n\n" | 26 | //usage:#define expand_full_usage "\n\n" |
| 27 | //usage: "Convert tabs to spaces, writing to stdout\n" | 27 | //usage: "Convert tabs to spaces, writing to stdout\n" |
| 28 | //usage: "\nOptions:" | ||
| 29 | //usage: IF_FEATURE_EXPAND_LONG_OPTIONS( | 28 | //usage: IF_FEATURE_EXPAND_LONG_OPTIONS( |
| 30 | //usage: "\n -i,--initial Don't convert tabs after non blanks" | 29 | //usage: "\n -i,--initial Don't convert tabs after non blanks" |
| 31 | //usage: "\n -t,--tabs=N Tabstops every N chars" | 30 | //usage: "\n -t,--tabs=N Tabstops every N chars" |
| @@ -39,7 +38,6 @@ | |||
| 39 | //usage: "[-fa][-t N] [FILE]..." | 38 | //usage: "[-fa][-t N] [FILE]..." |
| 40 | //usage:#define unexpand_full_usage "\n\n" | 39 | //usage:#define unexpand_full_usage "\n\n" |
| 41 | //usage: "Convert spaces to tabs, writing to stdout\n" | 40 | //usage: "Convert spaces to tabs, writing to stdout\n" |
| 42 | //usage: "\nOptions:" | ||
| 43 | //usage: IF_FEATURE_UNEXPAND_LONG_OPTIONS( | 41 | //usage: IF_FEATURE_UNEXPAND_LONG_OPTIONS( |
| 44 | //usage: "\n -a,--all Convert all blanks" | 42 | //usage: "\n -a,--all Convert all blanks" |
| 45 | //usage: "\n -f,--first-only Convert only leading blanks" | 43 | //usage: "\n -f,--first-only Convert only leading blanks" |