summaryrefslogtreecommitdiffstats
path: root/tools/h5stat/testfiles
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-07-28 21:21:10 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-07-28 21:21:10 (GMT)
commit23d8cb041d56f67e413638860349cf2d00fa275b (patch)
tree4c873b29836d0402d5b0c4c8ab4f315564d8efdc /tools/h5stat/testfiles
parent8f83e3615a19f7e420dab0e08c1c4a82a81635e6 (diff)
downloadhdf5-23d8cb041d56f67e413638860349cf2d00fa275b.zip
hdf5-23d8cb041d56f67e413638860349cf2d00fa275b.tar.gz
hdf5-23d8cb041d56f67e413638860349cf2d00fa275b.tar.bz2
Merge errors fixed
Diffstat (limited to 'tools/h5stat/testfiles')
-rw-r--r--tools/h5stat/testfiles/h5stat_help1.ddl1
-rw-r--r--tools/h5stat/testfiles/h5stat_help2.ddl1
-rw-r--r--tools/h5stat/testfiles/h5stat_nofile.ddl1
3 files changed, 3 insertions, 0 deletions
diff --git a/tools/h5stat/testfiles/h5stat_help1.ddl b/tools/h5stat/testfiles/h5stat_help1.ddl
index 4c61425..ce8bb73 100644
--- a/tools/h5stat/testfiles/h5stat_help1.ddl
+++ b/tools/h5stat/testfiles/h5stat_help1.ddl
@@ -21,3 +21,4 @@ Usage: h5stat [OPTIONS] file
information for small # of attributes. N is an integer greater
than 0. The default threshold is 10.
-S, --summary Print summary of file space information
+ --enable-error-stack Prints messages from the HDF5 error stack as they occur
diff --git a/tools/h5stat/testfiles/h5stat_help2.ddl b/tools/h5stat/testfiles/h5stat_help2.ddl
index 4c61425..ce8bb73 100644
--- a/tools/h5stat/testfiles/h5stat_help2.ddl
+++ b/tools/h5stat/testfiles/h5stat_help2.ddl
@@ -21,3 +21,4 @@ Usage: h5stat [OPTIONS] file
information for small # of attributes. N is an integer greater
than 0. The default threshold is 10.
-S, --summary Print summary of file space information
+ --enable-error-stack Prints messages from the HDF5 error stack as they occur
diff --git a/tools/h5stat/testfiles/h5stat_nofile.ddl b/tools/h5stat/testfiles/h5stat_nofile.ddl
index 4c61425..ce8bb73 100644
--- a/tools/h5stat/testfiles/h5stat_nofile.ddl
+++ b/tools/h5stat/testfiles/h5stat_nofile.ddl
@@ -21,3 +21,4 @@ Usage: h5stat [OPTIONS] file
information for small # of attributes. N is an integer greater
than 0. The default threshold is 10.
-S, --summary Print summary of file space information
+ --enable-error-stack Prints messages from the HDF5 error stack as they occur