diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:56:39 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:56:39 +0000 |
| commit | 811c449748d5bd0505f8510e5582892f94ac0cda (patch) | |
| tree | 2640249cb2a9605c7cd59467b9861b205e9bcc8a /coreutils/test.c | |
| parent | c0d4367d6b581eb5989c02815880cf0fa2851ae8 (diff) | |
| parent | 19311bfa7b8e8c6effa9c375de9b0eb4338bee12 (diff) | |
| download | busybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.tar.gz busybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.tar.bz2 busybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.zip | |
Merge commit '19311bfa7b8e8c6effa9c375de9b0eb4338bee12' into merge
Conflicts:
coreutils/ls.c
shell/ash.c
Diffstat (limited to 'coreutils/test.c')
| -rw-r--r-- | coreutils/test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coreutils/test.c b/coreutils/test.c index caecd7d02..cb15ed725 100644 --- a/coreutils/test.c +++ b/coreutils/test.c | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | /* This is a NOFORK applet. Be very careful! */ | 45 | /* This is a NOFORK applet. Be very careful! */ |
| 46 | 46 | ||
| 47 | /* test_main() is called from shells, and we need to be extra careful here. | 47 | /* test_main() is called from shells, and we need to be extra careful here. |
| 48 | * This is true regardless of PREFER_APPLETS and STANDALONE_SHELL | 48 | * This is true regardless of PREFER_APPLETS and SH_STANDALONE |
| 49 | * state. */ | 49 | * state. */ |
| 50 | 50 | ||
| 51 | /* test(1) accepts the following grammar: | 51 | /* test(1) accepts the following grammar: |