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

Posted to commits@subversion.apache.org by rh...@apache.org on 2016/08/28 22:31:08 UTC

svn commit: r1758160 - /subversion/trunk/subversion/libsvn_client/conflicts.c

Author: rhuijben
Date: Sun Aug 28 22:31:08 2016
New Revision: 1758160

URL: http://svn.apache.org/viewvc?rev=1758160&view=rev
Log:
Allow resolving conflicts on binary files to the base version, just like
text files.

* subversion/libsvn_client/conflicts.c
  (binary_conflict_options): Add missing option.

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

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1758160&r1=1758159&r2=1758160&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Sun Aug 28 22:31:08 2016
@@ -6670,6 +6670,13 @@ static const svn_client_conflict_option_
   },
 
   {
+    svn_client_conflict_option_base_text,
+    N_("discard local and incoming changes for this binary file"),
+    NULL,
+    resolve_text_conflict
+  },
+
+  {
     svn_client_conflict_option_incoming_text,
     N_("accept incoming version of binary file"),
     NULL,