SVN-like merging (contrib)

Tue May 9 12:50:32 CDT 2006

current/other sounds good; however, you may want to use .old instead
of .parent ("old" to contrast with "current").

On Tue, May 09, 2006 at 01:37:26PM -0400, Sébastien Pierre wrote:
> Le mardi 09 mai 2006 à 19:32 +0200, Frederic Lehobey a écrit :
> 
> > current/other?  :-)
> 
> Sounds good ! I will go for it (unless there is an even more natural
> proposition ;).
> 
>  -- Sébastien
> 
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: Digital signature
Url : http://www.selenic.com/pipermail/mercurial/attachments/20060509/2eac5fc4/attachment.pgp