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

Re: svn commit: r15181 - trunk/notes

From: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2005-06-27 20:15:59 CEST

On Mon, 2005-06-27 at 11:52 -0500, sussman@tigris.org wrote:
> + It seems that in the case of lines of text, our current diff3
> + ignores text-bases completely, possibly overwriting local mods.

Can you explain how this could result in overwriting local mods?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jun 27 20:17:19 2005

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.