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

Re: 3 way merge algorithm

From: <kfogel_at_collab.net>
Date: 2004-05-04 20:03:36 CEST

Torsten Rueger <torsten.rueger@hiit.fi> writes:
> and patch process should result in less conflicts. Even if you do it
> on a line basis. But as I understand you use external patch, so that's
> out of the question.

We use an internal diff/patch library now, in Subversion.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 4 21:18:25 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.