svn commit: r1725989 - /subversion/trunk/subversion/libsvn_client/resolved.c

[st...@apache.org]

Author: stsp
Date: Thu Jan 21 15:44:23 2016
New Revision: 1725989

URL: http://svn.apache.org/viewvc?rev=1725989&view=rev
Log:
* subversion/libsvn_client/resolved.c
  (binary_conflict_options, prop_conflict_options): Add the
   svn_client_conflict_option_merged_text option here, too
   The 'svn' client currently maps this option to 'mark resolved'.

Modified:
    subversion/trunk/subversion/libsvn_client/resolved.c

Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1725989&r1=1725988&r2=1725989&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Thu Jan 21 15:44:23 2016
@@ -548,6 +548,13 @@ static const svn_client_conflict_option_
     resolve_text_conflict
   },
 
+  {
+    svn_client_conflict_option_merged_text,
+    N_("accept the file as it appears in the working copy"),
+    NULL,
+    resolve_text_conflict
+  },
+
 };
 
 /* Resolver options for a property conflict */
@@ -573,6 +580,13 @@ static const svn_client_conflict_option_
     NULL,
     resolve_prop_conflict
   },
+
+  {
+    svn_client_conflict_option_merged_text,
+    N_("accept merged version of property value"),
+    NULL,
+    resolve_prop_conflict
+  },
 
 };