[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merge algorithm
|
From: |
Eric Siegerman |
|
Subject: |
Re: Merge algorithm |
|
Date: |
Tue, 20 Mar 2001 18:59:46 -0500 |
|
User-agent: |
Mutt/1.2.5i |
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)