Index: subversion/libsvn_client/conflicts.c
===================================================================
--- subversion/libsvn_client/conflicts.c	(revision 1764448)
+++ subversion/libsvn_client/conflicts.c	(working copy)
@@ -7121,7 +7121,7 @@
         resolve_text_conflict);
 
       add_resolution_option(*options, conflict,
-        svn_client_conflict_option_merged_text,
+        svn_client_conflict_option_working_text,
         _("accept binary file as it appears in the working copy"),
         resolve_text_conflict);
   }
Index: subversion/svn/conflict-callbacks.c
===================================================================
--- subversion/svn/conflict-callbacks.c	(revision 1764448)
+++ subversion/svn/conflict-callbacks.c	(working copy)
@@ -1845,7 +1845,7 @@
       *option_id = svn_client_conflict_option_base_text;
       break;
     case svn_cl__accept_working:
-      *option_id = svn_client_conflict_option_merged_text;
+      *option_id = svn_client_conflict_option_working_text;
       break;
     case svn_cl__accept_mine_conflict:
       *option_id = svn_client_conflict_option_working_text_where_conflicted;
Index: subversion/svn/resolve-cmd.c
===================================================================
--- subversion/svn/resolve-cmd.c	(revision 1764448)
+++ subversion/svn/resolve-cmd.c	(working copy)
@@ -380,7 +380,7 @@
   switch (opt_state->accept_which)
     {
     case svn_cl__accept_working:
-      option_id = svn_client_conflict_option_merged_text;
+      option_id = svn_client_conflict_option_working_text;
       break;
     case svn_cl__accept_base:
       option_id = svn_client_conflict_option_base_text;
Index: subversion/tests/cmdline/resolve_tests.py
===================================================================
--- subversion/tests/cmdline/resolve_tests.py	(revision 1764448)
+++ subversion/tests/cmdline/resolve_tests.py	(working copy)
@@ -602,7 +602,6 @@
 
 # Test for issue #4647 'auto resolution mine-full fails on binary file'
 @Issue(4647)
-@XFail()
 def automatic_binary_conflict_resolution(sbox):
   "resolve -R --accept [base | mf | tf] binary file"