Re: Merge algorithm

[Szabó Tamás]

Thanks for the replies...

Tamas


Eric Siegerman wrote:
> 
> On Tue, Mar 20, 2001 at 01:20:33PM -0800, Pyatt, Scott wrote:
> > Does anyone know for sure if diff3 is called and if not, what is used?  Does
> > anyone know if the algorithm is documented?
> 
> It sure seems to be diff3.  See src/rcscmds.c, function
> RCS_merge().
> 
> --
> 
> |  | /\
> |-_|/  >   Eric Siegerman, Toronto, Ont.        address@hidden
> |  |  /
> With sufficient thrust, pigs fly just fine. However, this is not
> necessarily a good idea.
>         - RFC 1925 (quoting an unnamed source)
> 
> _______________________________________________
> Info-cvs mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/info-cvs