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:47:17 UTC

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

Author: stsp
Date: Sat Jan 30 16:47:17 2016
New Revision: 1727728

URL: http://svn.apache.org/viewvc?rev=1727728&view=rev
Log:
* subversion/libsvn_client/resolved.c
  (prop_conflict_option): Fix the callback for 'base' property conflict option.

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=1727728&r1=1727727&r2=1727728&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Sat Jan 30 16:47:17 2016
@@ -906,7 +906,7 @@ static const svn_client_conflict_option_
     svn_client_conflict_option_base_text,
     N_("discard local and incoming changes for this property"),
     NULL,
-    resolve_text_conflict
+    resolve_prop_conflict
   },
 
   {