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

Re: more on svn diff / svn merge stuff

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-01-31 00:13:12 CET

Branko Čibej <brane@xbc.nu> writes:
> >Okay, how does 3-way merge differ from the planned functionality of
> >"svn merge"?
> >
> Greg says it doesn't. :-) I was asking purely for information.

Maybe it would be a good idea to give a scenario of what *you* mean by
3-way merge, just to make sure we're all talking about the same thing
here. (Unless you're already sure, in which case don't bother.)

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:01 2006

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.