Author: breser
Date: Mon Aug 18 17:06:49 2014
New Revision: 1618665
URL: http://svn.apache.org/r1618665
Log:
Use svn_error_trace() in implementation of svn_diff_mem_string_output_merge2().
* subversion/libsvn_diff/deprecated.c
(svn_diff_mem_string_output_merge2): Wrap in svn_error_trace().
Modified:
subversion/trunk/subversion/libsvn_diff/deprecated.c
Modified: subversion/trunk/subversion/libsvn_diff/deprecated.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/deprecated.c?rev=1618665&r1=1618664&r2=1618665&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_diff/deprecated.c Mon Aug 18 17:06:49
2014
@@ -340,12 +340,15 @@ svn_diff_mem_string_output_merge2(svn_st
svn_diff_conflict_display_style_t style,
apr_pool_t *pool)
{
- return svn_diff_mem_string_output_merge3(output_stream, diff, original,
- modified, latest,
- conflict_original,
- conflict_modified,
- conflict_latest,
- conflict_separator, style,
- NULL, NULL, /* no cancelation */
- pool);
+ return svn_error_trace(svn_diff_mem_string_output_merge3(output_stream, diff,
+ original,
+ modified, latest,
+ conflict_original,
+ conflict_modified,
+ conflict_latest,
+ conflict_separator,
+ style,
+ /* no cancelation */
+ NULL, NULL,
+ pool));
}
