JavaHL: Follow up to r29328 and 29228 by fixing up the new conflict
callback enumerations.
This fixes an error in the JavaHL tests.

[ in subversion/bindings/javahl ]
* tests/org/tigris/subversion/javahl/BasicTests.java
  (testMergeConflictResolution): Update the choice value used
   in the conflict callback.

* native/ConflictResolverCallback.cpp
  (javaChoiceToC): update the switch statement to include the
   new values.

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