diff options
| author | Ron Yorston <rmy@pobox.com> | 2015-03-14 20:33:00 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2015-03-14 20:33:00 +0000 |
| commit | a4f58436b78fe59e57620c6e0301f213ee25f273 (patch) | |
| tree | 8355f724926e605280af2d6f2b1ccc6b1bd02dee /coreutils/basename.c | |
| parent | ba0c36cfcf84efbac6f89e27238e04bb57e9cd45 (diff) | |
| parent | 49acc1a7618a28d34381cbb7661d7c981fcb238f (diff) | |
| download | busybox-w32-a4f58436b78fe59e57620c6e0301f213ee25f273.tar.gz busybox-w32-a4f58436b78fe59e57620c6e0301f213ee25f273.tar.bz2 busybox-w32-a4f58436b78fe59e57620c6e0301f213ee25f273.zip | |
Merge branch 'busybox' into merge
Conflicts:
coreutils/od_bloaty.c
libbb/lineedit.c
Diffstat (limited to 'coreutils/basename.c')
| -rw-r--r-- | coreutils/basename.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coreutils/basename.c b/coreutils/basename.c index 1f7a13713..ab0c972ed 100644 --- a/coreutils/basename.c +++ b/coreutils/basename.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | //usage:#define basename_trivial_usage | 31 | //usage:#define basename_trivial_usage |
| 32 | //usage: "FILE [SUFFIX]" | 32 | //usage: "FILE [SUFFIX]" |
| 33 | //usage:#define basename_full_usage "\n\n" | 33 | //usage:#define basename_full_usage "\n\n" |
| 34 | //usage: "Strip directory path and .SUFFIX from FILE\n" | 34 | //usage: "Strip directory path and .SUFFIX from FILE" |
| 35 | //usage: | 35 | //usage: |
| 36 | //usage:#define basename_example_usage | 36 | //usage:#define basename_example_usage |
| 37 | //usage: "$ basename /usr/local/bin/foo\n" | 37 | //usage: "$ basename /usr/local/bin/foo\n" |