Author: rhuijben
Date: Thu Jan 31 19:25:21 2013
New Revision: 1441153
URL: http://svn.apache.org/viewvc?rev=1441153&view=rev
Log:
* subversion/libsvn_client/merge.c
(do_merge): Revert accidental change in r1441143.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1441153&r1=1441152&r2=1441153&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Jan 31 19:25:21 2013
@@ -9563,6 +9563,9 @@ do_merge(apr_hash_t **modified_subtrees,
*modified_subtrees =
apr_hash_overlay(result_pool, *modified_subtrees,
merge_cmd_baton.skipped_abspaths);
+ *modified_subtrees =
+ apr_hash_overlay(result_pool, *modified_subtrees,
+ merge_cmd_baton.tree_conflicted_abspaths);
}
}
|