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 2015/09/18 15:26:07 UTC
svn commit: r1703841 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Fri Sep 18 13:26:07 2015
New Revision: 1703841
URL: http://svn.apache.org/viewvc?rev=1703841&view=rev
Log:
Follow-up to r1703839;
* subversion/svn/conflict-callbacks.c
(handle_prop_conflict): Pass arguments to edit_prop_conflict in correct order.
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1703841&r1=1703840&r2=1703841&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Fri Sep 18 13:26:07 2015
@@ -1119,7 +1119,7 @@ handle_prop_conflict(svn_client_conflict
{
SVN_ERR(edit_prop_conflict(&merged_propval,
base_propval, my_propval, their_propval,
- b->pb, b->editor_cmd, b->config,
+ b->editor_cmd, b->config, b->pb,
result_pool, scratch_pool));
resolved_allowed = (merged_propval != NULL);
}