Index: subversion/bindings/javahl/native/ConflictResolverCallback.cpp
===================================================================
--- subversion/bindings/javahl/native/ConflictResolverCallback.cpp	(revision 26870)
+++ subversion/bindings/javahl/native/ConflictResolverCallback.cpp	(working copy)
@@ -210,10 +210,10 @@
       return svn_wc_conflict_result_resolved;
     case org_tigris_subversion_javahl_ConflictResolverCallback_Result_choose_base:
       return svn_wc_conflict_result_choose_base;
-    case org_tigris_subversion_javahl_ConflictResolverCallback_Result_choose_repos:
-      return svn_wc_conflict_result_choose_repos;
-    case org_tigris_subversion_javahl_ConflictResolverCallback_Result_choose_user:
-      return svn_wc_conflict_result_choose_user;
+    case org_tigris_subversion_javahl_ConflictResolverCallback_Result_choose_theirs:
+      return svn_wc_conflict_result_choose_theirs;
+    case org_tigris_subversion_javahl_ConflictResolverCallback_Result_choose_mine:
+      return svn_wc_conflict_result_choose_mine;
     case org_tigris_subversion_javahl_ConflictResolverCallback_Result_choose_merged:
       return svn_wc_conflict_result_choose_merged;
     }
Index: subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResolverCallback.java
===================================================================
--- subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResolverCallback.java	(revision 26870)
+++ subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResolverCallback.java	(working copy)
@@ -67,12 +67,12 @@
         /**
          * User chooses the repository file.
          */
-        public static final int choose_repos = 3;
+        public static final int choose_theirs = 3;
 
         /**
          * User chooses own version of file.
          */
-        public static final int choose_user = 4;
+        public static final int choose_mine = 4;
 
         /**
          * User chooses the merged-file (which she may have manually