aboutsummaryrefslogtreecommitdiff
path: root/debianutils
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2021-12-27 08:21:55 +0000
committerRon Yorston <rmy@pobox.com>2021-12-27 08:21:55 +0000
commitb15f68214da209b5b293039c09c00f490c0cc193 (patch)
treed644b5d9318b79cb1baa356cbb63318cc4872c05 /debianutils
parent1ee308c75f4720ee38be8e81ff8c9ed4c52670d4 (diff)
parent44075929a8b9c1861d15564fa6ac4562abb724d7 (diff)
downloadbusybox-w32-b15f68214da209b5b293039c09c00f490c0cc193.tar.gz
busybox-w32-b15f68214da209b5b293039c09c00f490c0cc193.tar.bz2
busybox-w32-b15f68214da209b5b293039c09c00f490c0cc193.zip
Merge busybox into merge
Fix merge conflict in coreutils/timeout.c.
Diffstat (limited to 'debianutils')
-rw-r--r--debianutils/which.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/debianutils/which.c b/debianutils/which.c
index 8e047efc2..815ac71da 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -17,9 +17,10 @@
17//kbuild:lib-$(CONFIG_WHICH) += which.o 17//kbuild:lib-$(CONFIG_WHICH) += which.o
18 18
19//usage:#define which_trivial_usage 19//usage:#define which_trivial_usage
20//usage: "COMMAND..." 20//usage: "[-a] COMMAND..."
21//usage:#define which_full_usage "\n\n" 21//usage:#define which_full_usage "\n\n"
22//usage: "Locate COMMAND" 22//usage: "Locate COMMAND\n"
23//usage: "\n -a Show all matches"
23//usage: 24//usage:
24//usage:#define which_example_usage 25//usage:#define which_example_usage
25//usage: "$ which login\n" 26//usage: "$ which login\n"