You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2016/01/30 17:23:05 UTC

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

Author: stsp
Date: Sat Jan 30 16:23:04 2016
New Revision: 1727720

URL: http://svn.apache.org/viewvc?rev=1727720&view=rev
Log:
* subversion/libsvn_client/resolved.c
  (text_conflict_options): Add svn_client_conflict_option_base_text to the
   list of valid text conflict options. Missed by accident.

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=1727720&r1=1727719&r2=1727720&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Sat Jan 30 16:23:04 2016
@@ -816,6 +816,13 @@ static const svn_client_conflict_option_
   },
 
   {
+    svn_client_conflict_option_base_text,
+    N_("discard local and incoming changes for this file"),
+    NULL,
+    resolve_text_conflict
+  },
+
+  {
     svn_client_conflict_option_incoming_text,
     N_("accept incoming version of entire file"),
     NULL,