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/11/25 10:59:44 UTC
svn commit: r1771280 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: stsp
Date: Fri Nov 25 10:59:44 2016
New Revision: 1771280
URL: http://svn.apache.org/viewvc?rev=1771280&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
(create_node_tree_conflict): Remove whitespace.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1771280&r1=1771279&r2=1771280&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Fri Nov 25 10:59:44 2016
@@ -530,8 +530,6 @@ create_node_tree_conflict(svn_skel_t **c
nmb->dst_relpath),
scratch_pool);
-
-
return svn_error_trace(
create_tree_conflict(conflict_p, umb->wcroot, dst_local_relpath,
svn_relpath_prefix(dst_local_relpath,