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 2012/05/12 14:30:43 UTC
svn commit: r1337521 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Sat May 12 12:30:42 2012
New Revision: 1337521
URL: http://svn.apache.org/viewvc?rev=1337521&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(svn_cl__conflict_handler): Indentation fix.
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1337521&r1=1337520&r2=1337521&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Sat May 12 12:30:42 2012
@@ -419,9 +419,9 @@ svn_cl__conflict_handler(svn_wc_conflict
if (desc->kind == svn_wc_conflict_kind_text)
SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
_("Conflict discovered in '%s'.\n"),
- svn_cl__local_style_skip_ancestor(
- b->path_prefix, desc->local_abspath,
- subpool)));
+ svn_cl__local_style_skip_ancestor(
+ b->path_prefix, desc->local_abspath,
+ subpool)));
else if (desc->kind == svn_wc_conflict_kind_property)
{
SVN_ERR(svn_cmdline_fprintf(stderr, subpool,