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 2013/02/25 18:39:17 UTC

svn commit: r1449787 - /subversion/trunk/subversion/svn/conflict-callbacks.c

Author: stsp
Date: Mon Feb 25 17:39:15 2013
New Revision: 1449787

URL: http://svn.apache.org/r1449787
Log:
* subversion/svn/conflict-callbacks.c
  (handle_tree_conflict): Remove redundant parentheses.

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=1449787&r1=1449786&r2=1449787&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Mon Feb 25 17:39:15 2013
@@ -884,8 +884,8 @@ handle_tree_conflict(svn_wc_conflict_res
 
       svn_pool_clear(iterpool);
 
-      if ((desc->operation == svn_wc_operation_update ||
-           desc->operation == svn_wc_operation_switch))
+      if (desc->operation == svn_wc_operation_update ||
+          desc->operation == svn_wc_operation_switch)
         {
           if (desc->reason == svn_wc_conflict_reason_moved_away)
             tc_opts = tree_conflict_options_update_moved_away;