Re: more on svn diff / svn merge stuff

Karl Fogel wrote:

>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.)
>

It's "diff3 -A",
http://www.quick.com.au/cgi-bin/rtfm?topic=diff3&section=1, where
/older/ is a common ancestore of /mine/ and /yours/.

-- 
Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org