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 2017/02/06 11:53:40 UTC
svn commit: r1781883 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Mon Feb 6 11:53:39 2017
New Revision: 1781883
URL: http://svn.apache.org/viewvc?rev=1781883&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(describe_incoming_deletion_upon_update,
describe_incoming_deletion_upon_merge): 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=1781883&r1=1781882&r2=1781883&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Feb 6 11:53:39 2017
@@ -2712,8 +2712,7 @@ describe_incoming_deletion_upon_update(
apr_psprintf(result_pool,
_("%s\nThe replaced directory was moved to "
"'^/%s'."), description,
- get_moved_to_repos_relpath(details,
- scratch_pool));
+ get_moved_to_repos_relpath(details, scratch_pool));
return append_moved_to_chain_description(description,
move->next,
result_pool,
@@ -2793,8 +2792,7 @@ describe_incoming_deletion_upon_update(
apr_psprintf(result_pool,
_("%s\nThe replaced directory was moved to "
"'^/%s'."), description,
- get_moved_to_repos_relpath(details,
- scratch_pool));
+ get_moved_to_repos_relpath(details, scratch_pool));
return append_moved_to_chain_description(description,
move->next,
result_pool,
@@ -3503,8 +3501,7 @@ describe_incoming_deletion_upon_merge(
apr_psprintf(result_pool,
_("%s\nThe replaced directory was moved to "
"'^/%s'."), description,
- get_moved_to_repos_relpath(details,
- scratch_pool));
+ get_moved_to_repos_relpath(details, scratch_pool));
return append_moved_to_chain_description(description,
move->next,
result_pool,