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

Posted to commits@subversion.apache.org by st...@apache.org on 2016/04/20 16:30:19 UTC

svn commit: r1740148 - /subversion/trunk/subversion/libsvn_client/conflicts.c

Author: stsp
Date: Wed Apr 20 14:30:18 2016
New Revision: 1740148

URL: http://svn.apache.org/viewvc?rev=1740148&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (resolve_merge_incoming_added_file_text_merge): Add missing ')' to fix build.

Modified:
    subversion/trunk/subversion/libsvn_client/conflicts.c

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1740148&r1=1740147&r2=1740148&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Apr 20 14:30:18 2016
@@ -3676,7 +3676,7 @@ resolve_merge_incoming_added_file_text_m
 
   /* Create a property diff which shows all props as added. */
   SVN_ERR(svn_prop_diffs(&propdiffs, incoming_new_props,
-                         apr_hash_make(scratch_pool), scratch_pool);
+                         apr_hash_make(scratch_pool), scratch_pool));
 
   /* ### The following WC modifications should be atomic. */
   SVN_ERR(svn_wc__acquire_write_lock_for_resolve(&lock_abspath, ctx->wc_ctx,