Re: [PLUG] (Free) Graphical Diff Tools

[Lee Marzke <lee@marzke.net>]

How about lighting talks with demo's of free Graphical Diff tools.

The best diff/merge tool on Linux that I know of is P4Merge.

It's not widely known, but Perforce licenses the server,  not the client.
You can download [1] the P4V client ( available for Linux, Windows, Mac )
and then use the Diff or 3-way merge on any platform without a license.

Here's a page [2] about using P4Merge with Git.


[1] http://www.perforce.com/perforce/downloads/index.html
[2] http://www.andymcintosh.com/?p=33

Lee

On 02/11/2011 05:08 PM, Randall A Sindlinger wrote:
> All of these different diff tools (and no one mentioned vimdiff!) could
> make a nice set of lightning-talks.
>
> The subject of diff'ing files came up at PLUG-Central, and a lot of
> people were only familiar with maybe one additional tool besides 'diff',
> if any at all.
>
> I could present vimdiff, and I could also present diff itself, which I think
> is worth doing with highlighting useful combinations of options to it.
> (diff --help is 81 lines!)
>
> -Randall
>
> On Fri, Feb 11, 2011 at 10:35:07AM -0500, David Colon wrote:
> > I recently discovered xxdiff and really like it. It's similar to xdiff which
> > for the longest time was only available for Solaris. It's available in the
> > standard Ubuntu and Debian repositories.
> >
> > David
> >
> > On Fri, Feb 11, 2011 at 5:50 AM, JP Vossen<jp@jpsdomain.org>  wrote:
> >
> > > Summary: Quick run-down on 3 open-source graphical diff tools.
> > >
> > > ________________________________
> > >
> > > I was using the 'meld' graphical 'diff' program on Linux the other day
> > >
> > > On Windows I use TortoiseMerge.exe from the TortoiseSVN project, but Ican't recommend it without reservations.
> > >
> > > Probably the more common Windows tool is http://winmerge.org/
> ___________________________________________________________________________
> Philadelphia Linux Users Group         --        http://www.phillylinux.org
> Announcements - http://lists.phillylinux.org/mailman/listinfo/plug-announce
> General Discussion  --   http://lists.phillylinux.org/mailman/listinfo/plug


--
"Between subtle shading and the absence of light lies the nuance of iqlusion..."  - Kryptos

Lee Marzke,     lee@marzke.net                              http://marzke.net/lee/

begin:vcard
fn:Lee Marzke
n:Marzke;Lee
org:4AERO
adr:;;;Collegeville;PA;19426;US
email;internet:lee@marzke.net
title:Consultant
tel;work:800 393 5217
tel;fax:+1 484 348-2230
tel;cell:+1 484 961-0369
x-mozilla-html:TRUE
url:http://4aero.com
version:2.1
end:vcard

___________________________________________________________________________
Philadelphia Linux Users Group         --        http://www.phillylinux.org
Announcements - http://lists.phillylinux.org/mailman/listinfo/plug-announce
General Discussion  --   http://lists.phillylinux.org/mailman/listinfo/plug