Re: [PLUG] Diff tool to handle merges

2008-01-28 Thread tejas pawaskar
Hi, Try kdiff3. it is nice, you can compare directories, files between 2 or 3. u need to have kde installed on ur host machine. --- On Wed, 23/1/08, Devendra Laulkar <[EMAIL PROTECTED]> wrote: > From: Devendra Laulkar <[EMAIL PROTECTED]> > Subject: [PLUG] Diff tool to

Re: [PLUG] Diff tool to handle merges

2008-01-24 Thread Hemant Mohan
> > 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 > > ha

Re: [PLUG] Diff tool to handle merges

2008-01-23 Thread 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 c

Re: [PLUG] Diff tool to handle merges

2008-01-23 Thread शंतनु महाजन (Shant anoo 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 man

Re: [PLUG] Diff tool to handle merges

2008-01-23 Thread Anoop John
On Jan 23, 2008 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 ? Check out tkdiff http://www.google.com/search?q=tkdiff Cheers Anoop -- ---

[PLUG] Diff tool to handle merges

2008-01-23 Thread Devendra Laulkar
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 e