On Mon, Aug 18, 2014 at 02:33:38PM +0200, Bert Huijben wrote: > > -----Original Message----- > > From: s...@apache.org [mailto:s...@apache.org] > > Sent: donderdag 14 augustus 2014 21:23 > > To: comm...@subversion.apache.org > > Subject: svn commit: r1618024 - in /subversion/trunk/subversion: > > libsvn_client/merge.c libsvn_wc/tree_conflicts.c > > > > Author: stsp > > Date: Thu Aug 14 19:22:30 2014 > > New Revision: 1618024 > > At your request, a review of this change. > > I found a small issue around replacement detection, see inline.
Thanks! r1618616 (and r1618617) address this.