„Liste von Dateivergleichsprogrammen“ – Versionsunterschied
Zur Navigation springen
Zur Suche springen
| [ungesichtete Version] | [ungesichtete Version] |
Inhalt gelöscht Inhalt hinzugefügt
fix the fix (yes, I suck) |
|||
| Zeile 63: | Zeile 63: | ||
| - |
| - |
||
| [[2006]] |
| [[2006]] |
||
| 1. |
| 1.7 ([[February 11]], [[2009]]) |
||
| {{yes}} |
| {{yes}} |
||
| {{yes}} |
| {{yes}} |
||
Version vom 15. Juni 2009, 15:47 Uhr
General
Basic general information about file comparison software.
| Name | Creator | Software license | Cost | First public release date | Latest stable version | Windows | Macintosh | Linux | Other platforms |
|---|---|---|---|---|---|---|---|---|---|
| Vorlage:Rh | Altova DiffDog | Altova | Proprietary | USD 149 (single license), with a free 30 day trial version available | v2008r2sp2 | Ja (Win 2000, XP, 2003 Server, Vista) | Nein | Nein | ||
| Vorlage:Rh | Araxis Merge | Araxis Ltd | Proprietary | USD 129 (std) - 269 (pro) | 1993 | 2008.3626 (Nov 11, 2008) | Ja | Ja | Nein | |
| Vorlage:Rh | Beyond Compare | Scooter Software | Proprietary | USD 30 (std), 50 (pro) | 1996 | 3.1.3 (May 14, 2009) | Ja (Win95 and up) | Nein | Ja (only 32-bit version available) | |
| Vorlage:Rh | Compare It! | Grig Software | Proprietary | USD 29 | 3.86 (Jan 8, 2006) | Ja | Nein | Nein | ||
| Vorlage:Rh | csvdiff | Roland Schmitz | GPL | - | 2006 | 1.7 (February 11, 2009) | Ja | Ja | Ja | Anything with Perl |
| Vorlage:Rh | DeltaWalker | Deltopia Inc | Proprietary | USD 40 (std), 76 (pro) | 2007 | 2009 (1.8.6 Jan 29, 2009) | Ja | Ja | Ja | |
| Vorlage:Rh | diff, diff3 | AT&T | BSD 3-clause, BSD 4-clause, GPL, Proprietary | - | 1974 | Ja | Ja (Mac OS X) | Ja | ||
| Vorlage:Rh | Diff Commander | Nikeware | Proprietary | USD 29 | 2005 | 2.0 (Feb 26, 2007) | Ja | Nein | Nein | |
| Vorlage:Rh | DiffDaff | cyberpromote | Freeware | - | 1.0.0 (Jun 6, 2006) | Ja | Nein | Nein | ||
| Vorlage:Rh | DiffMerge | SourceGear | Proprietary | Free | 2003 | 3.2.0 (May 29, 2008) | Ja | Ja | Ja | |
| Vorlage:Rh | Diffuse | Derrick Moser | GPL | - | 2006 | 0.3.3 (Apr 13, 2009) | Ja | Ja (Fink) | Ja | Anything with PyGTK |
| Vorlage:Rh | Eclipse Compare | Eclipse | EPL | - | Ja | Ja (Mac OS X) | Ja | Anything with Java | ||
| Vorlage:Rh | ECMerge | Ellié Computing | Proprietary | from USD 30 (std) / USD 60 (pro) / floating licence | 2005 | 2.2 (Feb 16, 2008 | Ja (Win98 and up) | Ja (Mac OS X) | Ja | Sun Solaris |
| Vorlage:Rh | Ediff | Michael Kifer | GPL | - | Ja | Ja (Mac OS X) | Ja | Anything with Emacs | ||
| Vorlage:Rh | ExamDiff Pro | PrestoSoft | Proprietary | USD 35, with a free version available (ExamDiff) | 1998 | 4.0.2.11 (Jun 4, 2008) | Ja (Win98 and up) | Nein | Nein | |
| Vorlage:Rh | fc | Microsoft | Proprietary | Part of OS | Ja (DOS) | Nein | Nein | |||
| Vorlage:Rh | FileMerge | AppleComputer, Inc. | Proprietary | Free (part of Apple Developer Tools) | 2.2.1 (2005) | Nein | Ja (Mac OS X) | Nein | ||
| Vorlage:Rh | Guiffy SureMerge | Guiffy Software | Proprietary | Single user USD 66 / Mutli-user USD 44 per user | 2000 | 8.4 (Mar 25, 2008) | Ja | Ja | Ja | Anything with Java |
| Vorlage:Rh | IntelliJ IDEA Compare | JetBrains | Proprietary | Part of application | 6.0.5 (2007) | Ja | Ja | Ja | ||
| Vorlage:Rh | jEdit JDiff plugin | Various | GPL | Free | 1998 | 1.9.0 | Ja | Ja | Ja | Anything with Java |
| Vorlage:Rh | KDiff3 | Joachim Eibl | GPL | - | 2002 | 0.9.94 (Jan 17, 2009) | Ja | Ja (Mac OS X) | Ja | |
| Vorlage:Rh | Kompare | Otto Bruggeman | GPL | - | 3.5.0 (Nov 29, 2005) | Ja (Cygwin) | Nein | Ja | ||
| Vorlage:Rh | Lazarus Diff | Lazarus | GPL | - | 2000 | 2009 | Ja | Ja | Ja | FreeBSD |
| Vorlage:Rh | LizardTF | Ian Cornwell | GPL | Free - part of LizardTF | 0.1.3 (Jan 10, 2008) | Ja (Inc. 64bit) | Nein | Nein | ||
| Vorlage:Rh | MD5 File Comparison Tool | Derek Trauger | BSD 4-clause (equivalent) | - | 2009 | 1.0.0 | Ja | Nein | Nein | |
| Vorlage:Rh | Meld | Stephen Kennedy | GPL | - | 1.3 (Apr 18, 2009) | Nein | Ja (Mac OS X) | Ja | ||
| Vorlage:Rh | Perforce P4Merge | Perforce | Free for personal use | Free for personal use | 2008.1 (Aug 27, 2008) | Ja | Ja | Ja | Sun Solaris | |
| Vorlage:Rh | SmartSynchronize | SyntEvo | Proprietary | USD 52 | 2.5.1 (Mar 11, 2007) | Ja | Ja | Ja | Anything with Java | |
| Vorlage:Rh | Softinterface Diff Doc | Softinterface | Proprietary | USD 199 (single license), with a free 30 day Doc' trial version available | 2002 | 2007.3225 (Jun 06, 2007) | Ja (Windows 98-Vista and up) | Nein | Nein | |
| Vorlage:Rh | SwiftCompare | Oorja Software | Proprietary | USD 27 | 1.1 (Jan 19, 2007) | Ja (Win98 and up) | Nein | Nein | ||
| Vorlage:Rh | SyncEXPnet | SyncEXP.net | Proprietary | USD 49 | 2002 | 3.7 (Feb 26, 2008) | Ja | Nein | Nein | |
| Vorlage:Rh | Tkdiff | [1] | GPL | - | 4.1.3 (Feb 20, 2006) | Ja (Tcl) | Ja (Tcl) | Ja (Tcl) | Anything with Tcl | |
| Vorlage:Rh | TortoiseMerge | [2] | GPL | Part of TortoiseSVN | 1.4.8 (February 16, 2008) | Ja (Win2k and up) | Nein | Nein | ||
| Vorlage:Rh | Total Commander Compare | Christian Ghisler | Proprietary | Part of application | 7.01 (Jun 21, 2007) | Ja | Nein | Nein | ||
| Vorlage:Rh | UltraCompare | IDM Computer Solutions | Proprietary | USD 29.95 | 5.0 (May 18, 2007) | Ja | Nein | Nein | ||
| Vorlage:Rh | vimdiff | Bram Moolenaar et al. | GPL-compatible | - | 2001 | 7.0 (May 7, 2006) | Ja | Ja | Ja | Anything with vim |
| Vorlage:Rh | Visual Comparer | Nikeware | Proprietary | USD 29 | 1.60 (Feb 26, 2007) | Ja | Nein | Nein | ||
| Vorlage:Rh | WinDiff | Microsoft | Proprietary (with source code) | Part of Platform SDK | Ja | Nein | Nein | |||
| Vorlage:Rh | WinMerge | Dean Grimm | GPL | - | 1998 | 2.12.0 (March 5, 2009) | Ja (Win95 and up) | Nein | Nein | |
| Vorlage:Rh | xxdiff | Martin Blais | GPL | - | 2000 | 3.2 (Jun 30, 2006) | Ja (ver. 2.9) | Ja (source) | Ja (source) | |
| Vorlage:Rh | zsCompare | Zizasoft | Proprietary | USD 35 (lite) USD 99.95 (std) USD 199.95 (pro) | 2004 | 3.03 (July 6, 2006) | Ja | Ja | Ja | Anything with Java |
| Name | Creator | Software license | Cost | First public release date | Latest stable version | Windows | Macintosh | Linux | Other platforms |
Compare Features
| Name | Show Δ < whole line | Directory comparison | Binary comparison | Moved lines | 3-way comparison | Merge |
|---|---|---|---|---|---|---|
| Vorlage:Rh | Altova DiffDog | Ja | Ja | Ja | Nein | Ja | |
| Vorlage:Rh | Araxis Merge | Ja | Ja | Ja | Ja (Professional Edition only) | Ja | |
| Vorlage:Rh | Beyond Compare | Ja | Ja | Ja | Nein | Ja (Professional Edition only) | Ja (Pro only) |
| Vorlage:Rh | Compare It! | ||||||
| Vorlage:Rh | csvdiff | Nein | Nein | Nein | |||
| Vorlage:Rh | DeltaWalker | Ja | Ja | Ja | Ja (Oro only) | Ja | |
| Vorlage:Rh | diff | Nein | Ja | Nein | |||
| Vorlage:Rh | diff3 | Nein | Nein | Ja (non-optional) | |||
| Vorlage:Rh | Diff Commander | ||||||
| Vorlage:Rh | DiffDaff | Nein | Ja | Nein | Nein | ||
| Vorlage:Rh | DiffMerge | Ja | Ja | Ja | Ja | ||
| Vorlage:Rh | Diffuse | Ja | Nein | Ja (n-way comparison) | Ja | ||
| Vorlage:Rh | Eclipse Compare | Ja | Ja | Ja | |||
| Vorlage:Rh | ECMerge | Ja | Ja | Ja (optional, and ancestor can be hidden) | Ja | ||
| Vorlage:Rh | Ediff | Ja | Ja | Ja | |||
| Vorlage:Rh | ExamDiff Pro | Ja | Ja | Ja | Nein | Ja | |
| Vorlage:Rh | fc | Nein | Nein | Ja | Nein | Nein | |
| Vorlage:Rh | FileMerge | Ja | Ja (optional, by supplying an ancestor file/directory) | Ja | |||
| Vorlage:Rh | Guiffy SureMerge | Ja | Ja | ||||
| Vorlage:Rh | IntelliJ IDEA Compare | Ja | Ja | ||||
| Vorlage:Rh | jEdit JDiff plugin | Nein | Ja | ||||
| Vorlage:Rh | KDiff3 | Ja | Ja | Ja | Ja | ||
| Vorlage:Rh | Kompare | Ja | Nein | Nein | |||
| Vorlage:Rh | Lazarus Diff | ||||||
| Vorlage:Rh | LizardTF | Ja | v.stamps | Ja | Ja | ||
| Vorlage:Rh | Meld | Ja | Nein | Ja (optional) | Ja | ||
| Vorlage:Rh | Perforce P4Merge | Ja | Nein | Nein | Ja | Ja | |
| Vorlage:Rh | SmartSynchronize | Ja | Ja | Ja | |||
| Vorlage:Rh | Softinterface Diff Doc | Ja | Nein | Nein | |||
| Vorlage:Rh | SwiftCompare | Ja | Nein | Ja | |||
| Vorlage:Rh | Tkdiff | Nein | |||||
| Vorlage:Rh | TortoiseMerge | Nein | Ja | Ja | |||
| Vorlage:Rh | Total Commander Compare | Ja | Ja | Ja | Nein | Ja | |
| Vorlage:Rh | UltraCompare | Ja | Ja | Ja | Ja | Ja | |
| Vorlage:Rh | vimdiff | Ja | Ja (via DirDiff plugin) | Ja | |||
| Vorlage:Rh | Visual Comparer | ||||||
| Vorlage:Rh | WinDiff | Ja | Ja | Nein | Nein | ||
| Vorlage:Rh | WinMerge | Ja | Ja | Nein | Ja | Nein | Ja |
| Vorlage:Rh | xxdiff | Ja | Ja | Ja | Ja | ||
| Vorlage:Rh | zsCompare | Ja | Nein | Ja | |||
| Name | Show Δ < whole line | Directory comparison | Binary comparison | Moved lines | 3-way comparison | Merge |
API / Editor Features
| Name | GUI | CLI | Scripting | Horizontal / Vertical | Syntax Highlighting | Reports |
|---|---|---|---|---|---|---|
| Vorlage:Rh | Altova DiffDog | Ja | Ja | both | Ja | Ja XML, UNIX Diff | |
| Vorlage:Rh | Araxis Merge | Ja | Ja (and Full Automation API) | both | Ja (since Araxis Merge 2007) | Ja XML/HTML/HTML/Slideshow reports, UNIX diff | |
| Vorlage:Rh | Beyond Compare | Ja | Ja | Ja Custom | optional | Ja | Ja XML/HTML/CSV |
| Vorlage:Rh | Compare It! | ||||||
| Vorlage:Rh | csvdiff | Nein | Ja | Nein | Ja | ||
| Vorlage:Rh | DeltaWalker | Ja | Ja | both | Nein | Ja HTML/XML | |
| Vorlage:Rh | diff | Nein | Ja | horizontal | |||
| Vorlage:Rh | diff3 | Nein | Ja | horizontal | |||
| Vorlage:Rh | Diff Commander | ||||||
| Vorlage:Rh | DiffDaff | Ja | Nein | optional | |||
| Vorlage:Rh | DiffMerge | Ja | Nein | vertical | Nein | Ja | |
| Vorlage:Rh | Diffuse | Ja | Ja | vertical | Ja | ||
| Vorlage:Rh | Eclipse Compare | Ja | vertical | Ja | |||
| Vorlage:Rh | ECMerge | Ja | Ja (+ActiveX available) | Ja ECMAScript | optional | Ja | Ja customizable XML/HTML/CSV/text reports, UNIX diff |
| Vorlage:Rh | Ediff | Ja | Nein | both | Ja | ||
| Vorlage:Rh | ExamDiff Pro | Ja | Ja | optional | Ja | Ja, UNIX, HTML, and printable diff reports | |
| Vorlage:Rh | fc | Nein | Ja | horizontal | |||
| Vorlage:Rh | FileMerge | Ja | Ja ('opendiff') | vertical | Ja | Nein | |
| Vorlage:Rh | Guiffy SureMerge | Ja | Ja (and API) | both | Ja HTML 4.01 / CSS - W3C validated | ||
| Vorlage:Rh | IntelliJ IDEA Compare | Ja | vertical | Ja | |||
| Vorlage:Rh | jEdit JDiff plugin | Ja | both | Ja | |||
| Vorlage:Rh | KDiff3 | Ja | Ja | both | |||
| Vorlage:Rh | Kompare | Ja | vertical | Nein | |||
| Vorlage:Rh | Lazarus Diff | Ja | Ja | ||||
| Vorlage:Rh | LizardTF | Ja | Nein | both | |||
| Vorlage:Rh | Meld | Ja | Ja | vertical | Ja | Nein | |
| Vorlage:Rh | Perforce P4Merge | Ja | Ja | vertical | Nein | Nein | |
| Vorlage:Rh | SmartSynchronize | Ja | Ja | vertical | |||
| Vorlage:Rh | Softinterface Diff Doc | Ja | Ja (and Full Automation API) | both | Ja | Ja DOC, HTML, CSV | |
| Vorlage:Rh | SwiftCompare | Ja | Ja | Ja | |||
| Vorlage:Rh | Tkdiff | Ja | |||||
| Vorlage:Rh | TortoiseMerge | Ja | Ja | Nein | Nein | ||
| Vorlage:Rh | Total Commander Compare | Ja | optional | ||||
| Vorlage:Rh | UltraCompare | Ja | Ja | Nein | Ja | Nein | Unix diff |
| Vorlage:Rh | vimdiff | Ja | Ja | Ja vim script | both | Ja | Nein |
| Vorlage:Rh | Visual Comparer | ||||||
| Vorlage:Rh | WinDiff | Ja | Ja | horizontal | Nein | ||
| Vorlage:Rh | WinMerge | Ja | Ja | vertical | Ja | Ja (Recent versions: CSV/Tab-delimited/HTML/XML) | |
| Vorlage:Rh | xxdiff | Ja | Ja | optional | |||
| Vorlage:Rh | zsCompare | Ja | Ja | horizontal | |||
| Name | GUI | CLI | Scripting | Horizontal / Vertical | Syntax Highlighting | Reports |
Other features
Some other features which did not fit in previous table
| Name | ZIP support | FTP support | Version Control browsing | Patch creation | Patch application | Patch preview | Unicode support |
|---|---|---|---|---|---|---|---|
| Vorlage:Rh | Altova DiffDog | Ja | Ja | CVS | Ja | |||
| Vorlage:Rh | Araxis Merge | Ja | VSS, Perforce, Subversion | Ja (UNIX diff) | ||||
| Vorlage:Rh | Beyond Compare | Ja | Ja | Ja | Ja | |||
| Vorlage:Rh | Compare It! | |||||||
| Vorlage:Rh | csvdiff | Nein | Nein | Nein | ||||
| Vorlage:Rh | DeltaWalker | Ja | Ja (S)FTP, HTTP(S), WebDAV | Ja | Ja | |||
| Vorlage:Rh | diff | Nein | Jafs | Ja | ||||
| Vorlage:Rh | diff3 | Nein | Jafs | |||||
| Vorlage:Rh | Diff Commander | |||||||
| Vorlage:Rh | DiffDaff | Nein | Nein | |||||
| Vorlage:Rh | DiffMerge | Nein | Nein | Nein | Partial * | |||
| Vorlage:Rh | Diffuse | Ja | ||||||
| Vorlage:Rh | Eclipse Compare | Ja | ||||||
| Vorlage:Rh | ECMerge | Ja | Ja | Ja CVS (1.11-, 1.12+), evolution, Perforce, Subversion, Visual SourceSafe | Ja (3 formats, also for directories) | Ja | Ja | Ja (UTF8, UTF16 LE/BE, UTF32 LE/BE) |
| Vorlage:Rh | Ediff | Ja | Ja | |||||
| Vorlage:Rh | ExamDiff Pro | Ja (through a plug-in) | Ja (through a plug-in) | Ja (normal diff only) | Ja | |||
| Vorlage:Rh | fc | Nein | Nein | Nein | ||||
| Vorlage:Rh | FileMerge | Nein | Ja (supported by OS) | Nein | ||||
| Vorlage:Rh | Guiffy SureMerge | Ja | Ja (File Compares: UTF8, UTF16, MBCS, SJIS, over 150 file encoding and character set formats, Folder Compares support Unicode file/folder names) | |||||
| Vorlage:Rh | IntelliJ IDEA Compare | |||||||
| Vorlage:Rh | jEdit | Ja | Ja | Subversion | Ja | Ja | Ja | Ja |
| Vorlage:Rh | KDiff3 | (on KDE via KIO) | (on KDE via KIO) | Partial * | ||||
| Vorlage:Rh | Kompare | Ja | ||||||
| Vorlage:Rh | Lazarus Diff | |||||||
| Vorlage:Rh | LizardTF | Team Foundation Server (TFS) | tba | tba | tba | Ja | ||
| Vorlage:Rh | Meld | Plugins for CVS, subversion, mercurial, git, bzr, darcs, monotone | Ja | Ja | ||||
| Vorlage:Rh | Perforce P4Merge | Ja | ||||||
| Vorlage:Rh | SmartSynchronize | Nein | Nein | Nein | Ja | |||
| Vorlage:Rh | Softinterface Diff Doc | |||||||
| Vorlage:Rh | SwiftCompare | Nein (In the next release) | Nein (In the next release) | |||||
| Vorlage:Rh | Tkdiff | |||||||
| Vorlage:Rh | TortoiseMerge | Nein | Nein | Nein | ||||
| Vorlage:Rh | Total Commander Compare | Ja | ||||||
| Vorlage:Rh | UltraCompare | |||||||
| Vorlage:Rh | vimdiff | Ja | Ja | Ja | Ja | |||
| Vorlage:Rh | Visual Comparer | |||||||
| Vorlage:Rh | WinDiff | Nein | Nein | Nein | Nein | |||
| Vorlage:Rh | WinMerge | Ja | Nein | Ja (normal, context, unified) | Ja | |||
| Vorlage:Rh | xxdiff | Nein | Nein | |||||
| Vorlage:Rh | zsCompare | Ja | Nein | Ja | ||||
| Name | ZIP support | FTP support | Version Control browsing | Patch creation | Patch application | Patch preview | Unicode support |
- fs: Through filesystem (or filesystem plug-ins).
- * cannot identify UTF-8 files as unicode unless they have a BOM mark in the beginning.
Aspects
What aspects can be / are compared?
| Filename casing | CRC | Filedate | Daylight saving | Character casing | |
|---|---|---|---|---|---|
| Vorlage:Rh | Altova DiffDog | Ja | Ja | Ja | ||
| Vorlage:Rh | Araxis Merge | Ja (optional) | Ja (optional) | Ja (optional) | ||
| Vorlage:Rh | Beyond Compare | Ja | Ja | Ja | Ja | Ja |
| Vorlage:Rh | Compare It! | |||||
| Vorlage:Rh | csvdiff | Ja (optional) | Ja (optional) | |||
| Vorlage:Rh | DeltaWalker | Ja (platform dependent) | Ja | Ja | Ja (optional) | |
| Vorlage:Rh | diff | Optional | Optional | |||
| Vorlage:Rh | diff3 | |||||
| Vorlage:Rh | Diff Commander | |||||
| Vorlage:Rh | DiffDaff | Nein | Nein | Nein | Nein | Ja |
| Vorlage:Rh | DiffMerge | Ja (platform dependent) | Nein | Ja | Nein | Ja (optional) |
| Vorlage:Rh | Diffuse | |||||
| Vorlage:Rh | Eclipse Compare | |||||
| Vorlage:Rh | ECMerge | Ja (parametered) | Ja (CRC32/MD5) | Ja (optional) | Ja (optional, also filesize) | Ja (optional) |
| Vorlage:Rh | Ediff | |||||
| Vorlage:Rh | ExamDiff Pro | Nein | Ja (optional) | Ja (optional) | Ja (optional) | Ja (optional) |
| Vorlage:Rh | fc | Nein | Optional | |||
| Vorlage:Rh | FileMerge | Nein | Nein | Nein | Optional | |
| Vorlage:Rh | Guiffy SureMerge | Ja (filesystem dependent) Plus, support of Unicode file/folder names | Ja (optional) | Ja (optional) | ||
| Vorlage:Rh | IntelliJ IDEA Compare | |||||
| Vorlage:Rh | KDiff3 | Ja | Nein | Ja (optional) | Nein | Optional |
| Vorlage:Rh | Kompare | Ja | ||||
| Vorlage:Rh | Lazarus Diff | |||||
| Vorlage:Rh | LizardTF | |||||
| Vorlage:Rh | Meld | Ja (optional) | Nein | Ja | Nein | Ja |
| Vorlage:Rh | Perforce P4Merge | |||||
| Vorlage:Rh | SmartSynchronize | |||||
| Vorlage:Rh | Softinterface Diff Doc | |||||
| Vorlage:Rh | SwiftCompare | Ja | Ja (optional) | Ja (optional) | Ja (optional) | |
| Vorlage:Rh | Tkdiff | |||||
| Vorlage:Rh | TortoiseMerge | |||||
| Vorlage:Rh | Total Commander Compare | Optional | Optional | |||
| Vorlage:Rh | UltraCompare | |||||
| Vorlage:Rh | vimdiff | Nein | Nein | Nein | Nein | Ja |
| Vorlage:Rh | Visual Comparer | |||||
| Vorlage:Rh | WinDiff | Nein | Nein | when different | Ja | Optional |
| Vorlage:Rh | WinMerge | Nein | Nein | Optional | Optional | |
| Vorlage:Rh | xxdiff | |||||
| Vorlage:Rh | zsCompare | Ja (optional) | Ja (Adler32, CRC32) | Ja (optional) | Ja (optional) | Optional |
| Filename casing | CRC | Filedate | Daylight saving | Character casing |