Author: stsp
Date: Thu Jun 25 09:06:41 2015
New Revision: 1687450
URL: http://svn.apache.org/r1687450
Log:
* subversion/svn/conflict-callbacks.c
(conflict_func_interactive): Remove a check that's now redundant since
merged property values are not communicated via file paths anymore.
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=1687450&r1=1687449&r2=1687450&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Jun 25 09:06:41
2015
@@ -1288,10 +1288,6 @@ conflict_func_interactive(svn_wc_conflic
(*result)->choice = svn_wc_conflict_choose_base;
return SVN_NO_ERROR;
case svn_cl__accept_working:
- /* If the caller didn't merge the property values, then I guess
- * 'choose working' means 'choose mine'... */
- if (! merged_abspath)
- (*result)->merged_file = my_abspath;
(*result)->choice = svn_wc_conflict_choose_merged;
return SVN_NO_ERROR;
case svn_cl__accept_mine_conflict:
