From: Austin Ziegler <halostatue@...>
Date: 2007-03-16T09:58:38+09:00
Subject: Re: Merge / Diff algo

On 3/15/07, S. Robert James <srobertjames@gmail.com> wrote:
> Is there any lib to do simple text based merges (3 way) from Ruby?
>
> Perhaps it's simple enough to do without an external lib.  Just need
> to see which lines child1 added to parent, which ones child1 deleted,
> and same for child2, and then merge them - in order...
>
> Hmmm... perhaps I should use an external lib...

I seem to recall that someone had put some merge operations around Diff::LCS.

-austin
-- 
Austin Ziegler * halostatue@gmail.com * http://www.halostatue.ca/
               * austin@halostatue.ca * http://www.halostatue.ca/feed/
               * austin@zieglers.ca