Author: stsp
Date: Fri Sep 16 13:46:06 2016
New Revision: 1761032

URL: http://svn.apache.org/viewvc?rev=1761032&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (merge_incoming_added_dir_replace): Fix whitespace.

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=1761032&r1=1761031&r2=1761032&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri Sep 16 13:46:06 
2016
@@ -5789,7 +5789,7 @@ merge_incoming_added_dir_replace(svn_cli
     }
 
   /* Resolve to current working copy state.
-  * svn_client__merge_locked() requires this. */
+   * svn_client__merge_locked() requires this. */
   err = svn_wc__del_tree_conflict(ctx->wc_ctx, local_abspath, scratch_pool);
   if (err)
     goto unlock_wc;


Reply via email to