[PLUG] Diff tool to handle merges

["शंतनु महाजन (Shantanoo Mahajan)"]

On 23-Jan-08, at 10:57 PM, Devendra Laulkar wrote:

> Hi,
>
> I am trying to find a GUI tool for comparing source code & manually
> incorporating changes between different versions. Any suggestions ?
>
> I just tried xxdiff, but I didn't find simple option "Copy to left" or
> "Copy to right" (checked the manual a bit, but it mostly talks of
> handling conflicts etc)
>
> Any pointers welcome.

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

shantanoo