This is pretty cool, although a lot of times I am diffing files on a remote machine via ssh so I can't really run an application like this, so I usually end up using *vimdiff* - I hadn't ever used it until a few months ago but it comes in handy a lot.
-pat On Sun, May 29, 2011 at 7:07 AM, Roger E. Rustad, Jr. < roger.rus...@gmail.com> wrote: > While editing 2-3 config files at a time, I like to compare the > changes to make sure all is cool. This tool is great for that and > works on Linux, OS X, and Windows. > > http://www.sourcegear.com/diffmerge/ > > Features include: > > Diff screenshot -- Graphically shows the changes between two files. > Includes intra-line highlighting and full support for editing. > > Merge screenshot -- Graphically shows the changes between 3 files. > Allows automatic merging (when safe to do so) and full control over > editing the resulting file. > > Folder Diff screenshot -- Performs a side-by-side comparison of 2 > folders, showing which files are only present in one file or the > other, as well as file pairs which are identical or different. > > Windows Explorer Integration -- Right-click on any two files in > Windows Explorer to diff them immediately. > > Configurable -- Rulesets and options provide for customized appearance > and behavior. > > International -- Compatible with 42 different character encodings. > > Cross-platform -- Identical feature set on Windows, Mac OS X, and Linux. > _______________________________________________ > LinuxUsers mailing list > LinuxUsers@socallinux.org > http://socallinux.org/cgi-bin/mailman/listinfo/linuxusers >
_______________________________________________ LinuxUsers mailing list LinuxUsers@socallinux.org http://socallinux.org/cgi-bin/mailman/listinfo/linuxusers
