You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2012/05/18 21:55:55 UTC
svn commit: r1340225 - /subversion/trunk/subversion/include/svn_wc.h
Author: gstein
Date: Fri May 18 19:55:54 2012
New Revision: 1340225
URL: http://svn.apache.org/viewvc?rev=1340225&view=rev
Log:
Stylistic fix only
* subversion/include/svn_wc.h:
(svn_wc_merge4): put SVN_DEPRECATED on its own line
Modified:
subversion/trunk/subversion/include/svn_wc.h
Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1340225&r1=1340224&r2=1340225&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Fri May 18 19:55:54 2012
@@ -6674,7 +6674,8 @@ svn_wc_merge5(enum svn_wc_merge_outcome_
* @since New in 1.7.
* @deprecated Provided for backwards compatibility with the 1.7 API.
*/
-SVN_DEPRECATED svn_error_t *
+SVN_DEPRECATED
+svn_error_t *
svn_wc_merge4(enum svn_wc_merge_outcome_t *merge_outcome,
svn_wc_context_t *wc_ctx,
const char *left_abspath,