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 2011/03/01 17:28:36 UTC
svn commit: r1075886 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Author: stsp
Date: Tue Mar 1 16:28:36 2011
New Revision: 1075886
URL: http://svn.apache.org/viewvc?rev=1075886&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
(resolve_one_conflict): Fix indentation.
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.c
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1075886&r1=1075885&r2=1075886&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Tue Mar 1 16:28:36 2011
@@ -403,15 +403,15 @@ resolve_one_conflict(svn_wc__db_t *db,
* or mine-full, etc. Throw an error if the user expects us
* to be smarter than we really are. */
if (conflict_choice != svn_wc_conflict_choose_merged)
- {
- return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE,
- NULL,
- _("Tree conflicts can only be resolved "
- "to 'working' state; "
- "'%s' not resolved"),
- svn_dirent_local_style(local_abspath,
- iterpool));
- }
+ {
+ return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE,
+ NULL,
+ _("Tree conflicts can only be "
+ "resolved to 'working' state; "
+ "'%s' not resolved"),
+ svn_dirent_local_style(local_abspath,
+ iterpool));
+ }
SVN_ERR(svn_wc__db_op_set_tree_conflict(db, local_abspath, NULL,
iterpool));