[PLUG] Diff tool to handle merges

[Devendra Laulkar]

Hi,

On Wed, 2008-01-23 at 23:22 +0530, "शंतनु महाजन (Shantanoo
Mahajan)" wrote:
> On 23-Jan-08, at 10:57 PM, Devendra Laulkar wrote:
> >
> > I am trying to find a GUI tool for comparing source code & manually
> > incorporating changes between different versions. Any suggestions ?

> You can try kdiff3, meld, ... :)

meld seems to work just fine :) UI is intuitive. 
tkdiff is more like xxdiff.

Thanks !

-Devendra Laulkar.