[PLUG] Visual diff and patch tool

[Vaibhav Kulkarni]

On Sat, May 23, 2009 at 7:46 PM, Devendra Laulkar
<devendralaulkar at yahoo.com> wrote:
>
> Hi,
>
> I would like to know how people manage their diff's and patches.

I have found Eclipse's Apply Patch tool to be very neat. It allows
selectively applying the changes. Also, in case of version conflict
(as is in your case), it gives proper visual clues, i.e. which parts
will be merged correctly and which wont.

Regards,
Vaibhav