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/03/08 09:21:40 UTC
svn commit: r1734031 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Tue Mar 8 08:21:40 2016
New Revision: 1734031
URL: http://svn.apache.org/viewvc?rev=1734031&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(conflict_tree_get_details_incoming_delete): Fix indentation.
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=1734031&r1=1734030&r2=1734031&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Tue Mar 8 08:21:40 2016
@@ -1159,7 +1159,7 @@ conflict_tree_get_details_incoming_delet
b.details = details;
b.pool = scratch_pool;
/* Figure out when the node we switched away from, or merged
- * from another branch, was added. */
+ * from another branch, was added. */
SVN_ERR(svn_ra_get_location_segments(ra_session, "", old_rev,
old_rev, new_rev,
find_added_rev, &b,