[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: conflict resolver callback question / enhancement request

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-10-12 20:56:05 CEST

On 10/12/07, Erik Huelsmann <ehuels@gmail.com> wrote:

> Actually, it *is* a trivial thing to add, since I added an API to use
> our internal diff/merge algorithm on in-memory text blocks.

And how would we know if the propvalues (svn_string_t) are
contextually mergeable?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 12 20:56:14 2007

This is an archived mail posted to the Subversion Dev mailing list.