diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-04-10 20:19:35 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-04-10 20:19:35 (GMT) |
| commit | 45f6d4c1eed29c45476970a9703304378a5a1073 (patch) | |
| tree | 667240a5ea57e8a072bc8ffb59ecb7281867164c /tools/h5diff/testfiles/h5diff_505.txt | |
| parent | ad4b4b2b90c340bb408ddf32dd5cae780547bad2 (diff) | |
| parent | 09fa6e9c54380362f6f283ad60daef679ec91b25 (diff) | |
| download | hdf5-45f6d4c1eed29c45476970a9703304378a5a1073.zip hdf5-45f6d4c1eed29c45476970a9703304378a5a1073.tar.gz hdf5-45f6d4c1eed29c45476970a9703304378a5a1073.tar.bz2 | |
[svn-r22274] merge from trunk, resolve conflicts
Diffstat (limited to 'tools/h5diff/testfiles/h5diff_505.txt')
| -rw-r--r-- | tools/h5diff/testfiles/h5diff_505.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/h5diff/testfiles/h5diff_505.txt b/tools/h5diff/testfiles/h5diff_505.txt index a220730..607b99b 100644 --- a/tools/h5diff/testfiles/h5diff_505.txt +++ b/tools/h5diff/testfiles/h5diff_505.txt @@ -1,4 +1,4 @@ -</grp1> is of type H5G_GROUP and </slink_grp1> is of type H5G_LINK +Not comparable: </grp1> is of type H5G_GROUP and </slink_grp1> is of type H5G_LINK -------------------------------- Some objects are not comparable -------------------------------- |