Revert the part of r1518577 that modified the JavaHL merge utility test.

* subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java
  (UtilTests.testFileMerge): Do not use platform-specific newlines in the
   expected output. Unlike diff, merge apparently uses the surrounding end-of-line
   style when outputting the conflict markers.


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