aboutsummaryrefslogtreecommitdiff
path: root/coreutils/paste.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2019-01-10 08:38:15 +0000
committerRon Yorston <rmy@pobox.com>2019-01-10 08:38:15 +0000
commitf99a280743e877c14ee90a3f9e93a34ca3476a27 (patch)
tree60ca3d17596e190c8c7cbca587168946598bee8a /coreutils/paste.c
parent40d5dd07ea1f290eaed30a03fd598e33a8eaf495 (diff)
parent6ca8e347fed8c24655df692f22694baf7c572770 (diff)
downloadbusybox-w32-f99a280743e877c14ee90a3f9e93a34ca3476a27.tar.gz
busybox-w32-f99a280743e877c14ee90a3f9e93a34ca3476a27.tar.bz2
busybox-w32-f99a280743e877c14ee90a3f9e93a34ca3476a27.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/paste.c')
-rw-r--r--coreutils/paste.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/coreutils/paste.c b/coreutils/paste.c
index 52f67f951..3d81a5f1a 100644
--- a/coreutils/paste.c
+++ b/coreutils/paste.c
@@ -7,7 +7,7 @@
7 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 7 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
8 */ 8 */
9//config:config PASTE 9//config:config PASTE
10//config: bool "paste (4.5 kb)" 10//config: bool "paste (4.9 kb)"
11//config: default y 11//config: default y
12//config: help 12//config: help
13//config: paste is used to paste lines of different files together 13//config: paste is used to paste lines of different files together