Revision 1512354

Expose utility functions in JavaHL. Start by providing a file-based merge tool.

* build.conf (private-built-includes):
   Add org_apache_subversion_javahl_util_DiffLib.h.
  (javahl-java): Add ...javahl/util and reorder modules alphabetically.
  (javahl-callback-javah, javahl-remote-javah, javahl-callback-javah):
   Reorder modules alphabetically.
  (javahl-util-javah): New module.

* Makefile.in (javahl): Add javahl-remote-javah and javahl-util-javah.
  (doc-javahl): Add org.apache.subversion.javahl.util.

[in subversion/bindings/javahl/src/org/apache/subversion/javahl]
* SVNUtil.java: New Java class SVNUtil.
  (SVNUtil.DiffOptions): New nested class.
  (SVNUtil.ConflictDisplayStyle): New nested enumeration.
  (SVNUtil.FileMerge): New static methods.
* util/DiffLib.java: New Java class util.DiffLib.

[in subversion/bindings/javahl/native]
* org_apache_subversion_javahl_util_DiffLib.cpp:
   Native method wrappers for the util.DiffLib class.
  (Java_org_apache_subversion_javahl_util_DiffLib_nativeFileMerge):
   Native implementation of util.DiffLib.FileMerge.

[in subversion/bindings/javahl/tests/org/apache/subversion/javahl]
* UtilTests.java: New test suite for the SVNUtil class.
  (UtilTests.testFileMerge): New test case.
* RunTests.java: Add UtilTests to the test suite list.