Fix non-peg merge compatibility wrapper in JavaHL.

[in subversion/bindings/javahl/src/org/apache/subversion/javahl]
* SVNClient.java (SVNClient.merge): Fix silly typo in order of parameters in
   wrapped call to native method.
* ISVNClient.java: Whitespace change, no functional difference.

* subversion/bindings/javahl/native/SVNClient.h (SVNClient::merge):
   Remove extraneous overload declaration.


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