Barry Scott <ba...@barrys-emacs.org> writes: > Index: /Users/barry/wc/svn/svn-1.8.x/subversion/libsvn_wc/tree_conflicts.c > =================================================================== > --- /Users/barry/wc/svn/svn-1.8.x/subversion/libsvn_wc/tree_conflicts.c > (revision 1484244) > +++ /Users/barry/wc/svn/svn-1.8.x/subversion/libsvn_wc/tree_conflicts.c > (working copy) > @@ -506,6 +506,7 @@ > return SVN_NO_ERROR; > } > } > + *tree_conflict = NULL; > return SVN_NO_ERROR; > }
Committed to trunk and nominated for backport. Thanks! -- Certified & Supported Apache Subversion Downloads: http://www.wandisco.com/subversion/download
