Author: philip
Date: Tue May 10 14:23:42 2011
New Revision: 1101470
URL: http://svn.apache.org/viewvc?rev=1101470&view=rev
Log:
* subversion/libsvn_wc/merge.c
(maybe_resolve_conflicts): Remove unused 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=1101470&r1=1101469&r2=1101470&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Tue May 10 14:23:42 2011
@@ -828,13 +828,10 @@ maybe_resolve_conflicts(svn_skel_t **wor
apr_pool_t *scratch_pool)
{
svn_wc_conflict_result_t *result;
- const char *dir_abspath;
svn_skel_t *work_item;
*work_items = NULL;
- dir_abspath = svn_dirent_dirname(mt->local_abspath, scratch_pool);
-
/* Give the conflict resolution callback a chance to clean
up the conflicts before we mark the file 'conflicted' */
if (!conflict_func)
