I think it just uses diff3.
Noel
[EMAIL PROTECTED] on 2001.03.19 12:42:26
To: [EMAIL PROTECTED]
cc: (bcc: Noel L Yap)
Subject: Merge algorithm
Hi!
I got another question...
Is the merge algorithm used by CVS documented somewhere?
I would really appreciate if someone could point me to it.
Thanks in advance,
Tamas
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
This communication is for informational purposes only. It is not intended as
an offer or solicitation for the purchase or sale of any financial instrument
or as an official confirmation of any transaction. All market prices, data
and other information are not warranted as to completeness or accuracy and
are subject to change without notice. Any comments or statements made herein
do not necessarily reflect those of J.P. Morgan Chase & Co., its
subsidiaries and affiliates.
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs