diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:48:57 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:48:57 +0000 |
| commit | 9db164d6e39050d09f38288c6045cd2a2cbf6d63 (patch) | |
| tree | ea5dc2d28d15da0de25c197ed7d059c3656af1a0 /archival/tar.c | |
| parent | 1118c95535ea51961437089fc3dece5ab4ea7e1b (diff) | |
| parent | d84b175cb6948eb17f847313bf912174e2f934e1 (diff) | |
| download | busybox-w32-9db164d6e39050d09f38288c6045cd2a2cbf6d63.tar.gz busybox-w32-9db164d6e39050d09f38288c6045cd2a2cbf6d63.tar.bz2 busybox-w32-9db164d6e39050d09f38288c6045cd2a2cbf6d63.zip | |
Merge commit 'd84b175cb6948eb17f847313bf912174e2f934e1' into merge
Conflicts:
include/platform.h
Diffstat (limited to 'archival/tar.c')
| -rw-r--r-- | archival/tar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archival/tar.c b/archival/tar.c index 612b2119b..e7963b0b4 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
| @@ -926,7 +926,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv) | |||
| 926 | /* Prepend '-' to the first argument if required */ | 926 | /* Prepend '-' to the first argument if required */ |
| 927 | opt_complementary = "--:" // first arg is options | 927 | opt_complementary = "--:" // first arg is options |
| 928 | "tt:vv:" // count -t,-v | 928 | "tt:vv:" // count -t,-v |
| 929 | "X::T::" // cumulative lists | 929 | IF_FEATURE_TAR_FROM("X::T::") // cumulative lists |
| 930 | #if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM | 930 | #if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM |
| 931 | "\xff::" // cumulative lists for --exclude | 931 | "\xff::" // cumulative lists for --exclude |
| 932 | #endif | 932 | #endif |