Re: svn merge operation extremely slow

Kyle Leber wrote on Mon, Oct 03, 2011 at 08:16:53 -0400:
> On Mon, Oct 3, 2011 at 4:10 AM, Johan Corveleyn <jcorvel_at_gmail.com> wrote:
> > (2) If the "base" of the merge target doesn't have a mime-type, look
> > if it has one on the "actual" node (the uncommitted local
> > modifications). If that's binary, then we'll go binary.
> >
> > (3) Else: text merge

I stand corrected.
Received on 2011-10-03 14:32:41 CEST