You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ju...@apache.org on 2010/06/25 16:22:16 UTC

svn propchange: r879593 - svn:log

Author: julianfoad
Revision: 879593
Modified property: svn:log

Modified: svn:log at Fri Jun 25 14:22:16 2010
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Fri Jun 25 14:22:16 2010
@@ -1,5 +1,5 @@
-Deprecate svn_wc_merge3() to allow using the merge api directly from the
-patch code. This patch also adds a few new arguments to provide more
+Rev svn_wc_merge3() to svn_wc_merge4(), to allow using the merge api
+directly from the patch code.  Add new arguments to provide more
 information to conflict handlers and a cancel callback.
 
 * subversion/include/svn_wc.h