[plug] Merging 2 files, CVS-style

[Nick Bannon]

On Thu, Apr 13, 2000 at 02:26:59PM +0800, Peter Wright wrote:
[...]
> Oh well, at least some of it can be salvaged, as the "original" file
> still needs to be generated. For those who might be interested, I've
> attached both scripts (in perl - yes, would be better done in bourne
[...]

Great! <files a copy away in ~/bin in case of future need>

It looks like "merge" and "rcsmerge" both come with RCS and are probably
90% the same program, only rcsmerge does checkouts, etc. They may both
call diff3 internally.

Nick.

-- 
  Nick Bannon  | "I made this letter longer than usual because
nick at it.net.au | I lack the time to make it shorter." - Pascal