[svn-r15987] Merge with 1.8 rev 15871

Eliminate -c option and make that behavior the default and return 2 instead of -1 on error status

tested: linux

1 files changed, 2 insertions, 6 deletions

diff --git a/tools/h5diff/testfiles/h5diff_605.txt b/tools/h5diff/testfiles/h5diff_605.txt
index 9e45341..bce2118 100644
--- a/tools/h5diff/testfiles/h5diff_605.txt
+++ b/tools/h5diff/testfiles/h5diff_605.txt
@@ -10,7 +10,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -25,14 +24,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -41,7 +37,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use: