Merging upstream version 2.40.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 24 insertions, 0 deletions

diff --git a/tests/expected/misc/boilerplate-help b/tests/expected/misc/boilerplate-help
new file mode 100644
index 0000000..549400d
--- /dev/null
+++ b/tests/expected/misc/boilerplate-help
@@ -0,0 +1,24 @@
+
+Usage:
+ test_boilerplate [options] file...
+
+Short program description.
+
+Options:
+ -n, --no-argument       option does not use argument
+     --optional[=<arg>]  option argument is optional
+ -r, --required <arg>    option requires an argument
+ -z                      no long option
+     --xyzzy             a long option only
+ -e, --extremely-long-long-option
+                         use next line for description when needed
+ -l, --long-explanation  an example of very verbose, and chatty option
+                           description on two, or multiple lines, where the
+                           consecutive lines are intended by two spaces
+ -f, --foobar            next option description resets indent
+
+ -h, --help              display this help
+ -V, --version           display version
+
+For more details see fixme-command-name(1).
+ret=0