[svn-r15988] Merge with 1.8 up to rev 15871

Regarding h5diff, h5copy

Tested: linux

tools/h5diff/h5diff_common.c

@@ -67,6 +67,9 @@ void parse_command_line(int argc,
     /* process the command-line */
     memset(options, 0, sizeof (diff_opt_t));
 
+    /* assume equal contents initially */
+    options->contents = 1;
+
     /* parse command line options */
     while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF)
     {
@@ -160,6 +163,7 @@ void parse_command_line(int argc,
 
 }
 
+
 /*-------------------------------------------------------------------------
  * Function: print_info
  *
@@ -320,7 +324,6 @@ void usage(void)
  printf("   -v, --verbose           Verbose mode. Print differences, list of objects\n");
  printf("   -q, --quiet             Quiet mode. Do not do output\n");
 
-
  printf("   -n C, --count=C         Print differences up to C number\n");
  printf("   -d D, --delta=D         Print difference when greater than limit D\n");
  printf("   -p R, --relative=R      Print difference when greater than relative limit R\n");