Re: merging enchancement request

Ben Collins-Sussman <sussman@collab.net> wrote:
>
> Yes. In diff3 parlance, they'd be called "older" and "yours", but
> many of us think that's even more confusing than "left" and "right".

[Yes, I had to read the 'p4 resolve' man page several times before I
could figure out what exacly were 'yours', 'theirs', 'base' and 'merged'.]

'left' and 'right' are at least visually intuitive for those who use the
svn command-line client. But it might prove confusing for users of other
future clients...

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 9 18:28:55 2003