Author: stsp
Date: Tue Oct 11 16:05:18 2011
New Revision: 1181863
URL: http://svn.apache.org/viewvc?rev=1181863&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
(add_file): Remove a redundant if-statement.
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1181863&r1=1181862&r2=1181863&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Oct 11 16:05:18
2011
@@ -3093,7 +3093,6 @@ add_file(const char *path,
/* Is this path a conflict victim? */
if (conflicted)
- if (conflicted)
{
if (pb->deletion_conflicts)
tree_conflict = apr_hash_get(pb->deletion_conflicts, fb->name,
