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 /archival/tar.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 'archival/tar.c')
| -rw-r--r-- | archival/tar.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/archival/tar.c b/archival/tar.c index fca2d068b..612b2119b 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
| @@ -761,7 +761,6 @@ static void handle_SIGCHLD(int status) | |||
| 761 | //usage: ) | 761 | //usage: ) |
| 762 | //usage: "\n x Extract" | 762 | //usage: "\n x Extract" |
| 763 | //usage: "\n t List" | 763 | //usage: "\n t List" |
| 764 | //usage: "\nOptions:" | ||
| 765 | //usage: "\n f Name of TARFILE ('-' for stdin/out)" | 764 | //usage: "\n f Name of TARFILE ('-' for stdin/out)" |
| 766 | //usage: "\n C Change to DIR before operation" | 765 | //usage: "\n C Change to DIR before operation" |
| 767 | //usage: "\n v Verbose" | 766 | //usage: "\n v Verbose" |