1 12 merge java copyright header changes (#391)

* OESS-98 fix tools test for plugins

* sync fork

* Merge of changes from dev

* Move problem option to bottom of the list until fixed

* HDFFV-11106 - fix parsing optional args

* HDFFV-11106 add note

* grammer fix

* Whitespace after clang formatting

* Undo format version 11 changes

* Update check to working version

* Merge workflow and minor changes from develop

* Update supported platforms

* PR#3 merge from develop

* Merge gcc 10 diagnostics option from develop

* Merge #318 OSX changes from develop

* Merge serval small changes from dev

* fix typo

* Minor non-space formatting changes

* GH #386 copyright corrections for java folder

* revert because logic requires false return

1 files changed, 12 insertions, 0 deletions

diff --git a/tools/test/h5diff/testfiles/h5diff_624.txt b/tools/test/h5diff/testfiles/h5diff_624.txt
index cb8b8b4..903b738 100644
--- a/tools/test/h5diff/testfiles/h5diff_624.txt
+++ b/tools/test/h5diff/testfiles/h5diff_624.txt
@@ -144,6 +144,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
       (The option --follow-symlinks overrides the default behavior when
        symbolic links are compared.).
 
+ Subsetting options:
+  Subsetting is available by using the fcompact form of subsetting, as follows:
+    obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]
+  It is not required to use all parameters, but until the last parameter value used,
+  all of the semicolons (;) are required, even when a parameter value is not specified. Example:
+    obj1 /foo/mydataset[START;;COUNT;BLOCK]
+    obj1 /foo/mydataset[START]
+  The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
+  each dimension. START is optional and will default to 0 in each dimension.
+  Each of START, STRIDE, COUNT, and BLOCK must be a comma-separated list of integers with
+  one integer for each dimension of the dataset.
+
  Exit code:
   0 if no differences, 1 if differences found, 2 if error