Updated JavaHL diff utilities to return useful values from the diff and merge
functions. Incidentally, attempted to fix the related tests on Windows.

[in subversion/bindings/javahl/src/org/apache/subversion/javahl]
* SVNUtil.java (SVNUtil.fileDiff): Return a boolean value indicating
   that there were differences between the files.
  (SVNUtil.fileMerge): Return a boolean value indicating that
   the merge produced conflicts.

* util/DiffLib.java
   (DiffLib.fileDiff, DiffLib.fileMerge,
    DiffLib.nativeFileDiff, DiffLib.nativeFileMerge):
    Same changes as above.

[in subversion/bindings/javahl/native]
* org_apache_subversion_javahl_util_DiffLib.cpp
  (Java_org_apache_subversion_javahl_util_DiffLib_nativeFileDiff,
   Java_org_apache_subversion_javahl_util_DiffLib_nativeFileMerge):
   Calculate and and return the boolean return value.

[in subversion/bindings/javahl/tests/org/apache/subversion/javahl]
* UtilTests.java (UtilTests.testFileDiff): Check return value from
   SVNUtil.fileDiff, and adjust expected output for platform-specific
   end-of-line sequences.
  (UtilTests.testFileMerge): Similar changes as above.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1518577 13f79535-47bb-0310-9956-ffa450edef68