On Fri, 16 Mar 2007, S. Robert James 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... `diff3 -Em myfile oldfile yourfile` John Carter Phone : (64)(3) 358 6639 Tait Electronics Fax : (64)(3) 359 4632 PO Box 1645 Christchurch Email : john.carter / tait.co.nz New Zealand