You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ph...@apache.org on 2011/04/20 10:51:50 UTC

svn commit: r1095328 - /subversion/trunk/subversion/libsvn_wc/merge.c

Author: philip
Date: Wed Apr 20 08:51:50 2011
New Revision: 1095328

URL: http://svn.apache.org/viewvc?rev=1095328&view=rev
Log:
* subversion/libsvn_wc/merge.c
  (merge_text_file): Remove a shadowing variable.

Modified:
    subversion/trunk/subversion/libsvn_wc/merge.c

Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=1095328&r1=1095327&r2=1095328&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Wed Apr 20 08:51:50 2011
@@ -1030,7 +1030,6 @@ merge_text_file(svn_skel_t **work_items,
 
       if (*merge_outcome == svn_wc_merge_conflict)
         {
-          svn_skel_t *work_item;
           const char *left_copy, *right_copy, *target_copy;
 
           /* Preserve the three conflict files */