Author: rhuijben
Revision: 1666690
Modified property: svn:log
Modified: svn:log at Sat Mar 14 15:45:58 2015
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Sat Mar 14 15:45:58 2015
@@ -4,8 +4,8 @@ ancestor is skipped instead of the desce
* subversion/libsvn_client/merge.c
(record_skip): Only record a skip, if we really skipped this node, and
- not one of its ancestors. To do this handle this add parent baton
- argument.
+ not one of its ancestors. To do this handle this add a parent-baton
+ argument to this function.
(merge_file_changed,
merge_file_added,
merge_file_deleted): Update caller.
