Movatterモバイル変換


[0]ホーム

URL:


Jump to content
WikipediaThe Free Encyclopedia
Search

Comparison of file comparison tools

From Wikipedia, the free encyclopedia

Main article:Data comparison

This article comparescomputer software tools that comparefiles, and in many casesdirectories or folders, whether it is their main purpose or as part of more generalfile management.

General

[edit]

Basic general information aboutfile comparison software.

NameCreatorFOSSFreeFirst public release dateYear of latest stable versionWindowsMacintoshLinuxOther platformsMax supported file size
Beyond CompareScooter Software[1]No;ProprietaryNo19962025-10-29 (v5.1.6)YesYesYes> 2GB (64 bits)
Compare++Coode Software[2]No; ProprietaryNo20102016-7-17 (3.0.1.0b)Yes[3]NoNo
diff,diff3AT&TYes;BSD 3-clause,BSD 4-clause,CDDL, GPL, ProprietaryYes1974NoYes (Mac OS X)Yesported to most platforms as part ofSCCS> 2GB but less than 64 bits
Eclipse (compare)Yes;Eclipse Public LicenseYes2004-07-212016-09-28 (4.6.1 (Neon.1))YesYesYesAnything withJava
EdiffMichael Kifer[4]Yes;GPLYes19942.81.4Yes[a]Yes (Mac OS X)YesAnything withEmacs anddiff
ExamDiff ProPrestoSoft[5]No; ProprietaryNo19982025-10-01 (Build 16.0.1.10)Yes (WinXP and up)Yes (in Wine)Yes (in Wine)
Far Manager (compare)Eugene Roshal (original); FAR GroupYes; RevisedBSD licenseYes19962022-02-02 (v3.0 build 5959)YesNoNoThere's a beta-version of far2l,[6] a Linux fork of FAR Manager v2 which also works on OSX/MacOS and BSD.
fcMicrosoft[7]No; ProprietaryYes; Part ofOS1987Yes (DOS)NoNo
FileMerge (aka opendiff)Apple Inc.No; ProprietaryYes; (part ofApple Developer Tools)1993 (part ofNEXTSTEP 3.2[8])2014 (v2.8)NoYes (Mac OS X)No
FreeFileSync[data missing]ZenjuYes;GPLv3Yes20082023-10-23 (v13.2)YesYesYes
Guiffy SureMergeGuiffy Software[9]No; ProprietaryNo20002025-05-06 (v12.4)YesYesYesAnything withJava> 2GB
IntelliJ IDEA (compare)JetBrains[10]No; ProprietaryNo20012019-08-20 (2019.2.1)YesYesYes
jEdit JDiff pluginVarious[11]Yes; GPLYes19982020-09-03 (5.6.0)YesYesYesAnything withJava
Lazarus DiffLazarus (software)Yes; GPLYes20002020-07-11 (2.0.10)YesYesYesFreeBSD
MeldStephen Kennedy[12]Yes;GPLv2+Yes20022024-03-24 (3.22.2)Yes[13]YesYesBSD,Solaris
Notepad++ (compare)VariousYes;GPLv3Yes20092015-01-06 (1.5.6.6)Yes[14]NoNo
Perforce P4MergePerforceNo; ProprietaryYes2019 (2019.1/1815056)YesYesYesSun Solaris
Pretty DiffAustin Cheney[15]Yes; MIT-compatibleYes20092019-09-02 (101.2.6)Yes (Web)Yes (Web)Yes (Web)Node.js
TkdiffTkdiff[16]Yes;GPLv2+Yes2003 (or before)2021-03-24 (v5.2.1)Yes (Tcl)Yes (Tcl)Yes (Tcl)Anything with Tcl
Total Commander (compare)Christian Ghisler[17]No; ProprietaryNo2020-03-25 (v9.51)YesNoNo
twdiff (TextWrangler Diff Helper)[data missing]Bare Bones Software, Inc.[18]No; ProprietaryYes; withTextWrangler2012 (1.0 (v22))NoYesNoNo
vimdiffBram Moolenaar et al.Yes; GPL-compatible[19]Yes20012016-10-03 (v8.0.0022)YesYesYesAnything withvim
WinDiffMicrosoft[20]No; ProprietaryYes; Part ofPlatform SDK19922010-05-14 (v6.1.7716.0)YesNoNoNo
WinMergeDean Grimm[21]Yes; GPLYes19982025-04-27 (v2.16.48)[22]Yes (Win95 and up)Yes (in wine[23])Yes (in wine[23])2 GB
KDiff3[data missing] (part of KDE SDK,[24] as well as a plug-in to KDE Dolphin file manager)[25][26]Joachim Eibl and KDE SDK KDiff3 Team[27]Yes GPL v2Yes<2004 (v0.9.86)2023-01-13 (v1.10)Yes as part ofKDevelopKDE SDK download site or fromWindows store orKDE download site (most recent version) as separate application.Yes Can be downloaded fromKDE SDK download site or as separate stand-alone application fromKDE download siteYes Install from your Linux distribution repositories, or asAppStream, from[1], or as GIT projectKDE Gitlab[28] or from/on[2].[29]Any otherUnix with KDE/KF5, Qt5 and CMake, e.g.FreeBSD[30] &NetBSD[31]?
NameCreatorFOSSFreeFirst public release dateYear of latest stable versionWindowsMacintoshLinuxOther platformsMax supported file size

Compare features

[edit]
NameShow
in-line
changes
Directory comparison
Binary
comparison
Moved lines3-way comparisonMergeStructured comparison[b]Manual compare alignment
Image
compare
Beyond CompareYesYesYesYesYes (Files and Folders)Yes (Pro only)YesYes
Compare++YesYesYesYesYes (C/C++, C#, Java, JavaScript, CSS3)
diffNoYesPartialNoNoNo
diff3NoNoYes (non-optional)
Eclipse (compare)YesNo (only ancestor)YesNo
EdiffYesYesYesYesYes
ExamDiff ProYesYesYesYes[32]Yes (ExamDiff Pro Master only)[33]Yesmanual synchronization
Far Manager (compare)Yes (Via plugin)[34]YesYesYes (Via plugin)[34]NoNo
fcNoNoYesNoNo
FileMerge (aka opendiff)YesYesYesYes (optional ancestor)Yes
Guiffy SureMergeYesYesYesYesYesYesYes
IntelliJ IDEA (compare)YesYesYesNoYesYesYesYes
jEdit JDiff pluginYesNoYes
Lazarus Diff
MeldYesYesNoNoYesYesline alignment, unlink scroll
Notepad++ (compare)YesNoNoYesNoNoNo
Perforce P4MergeYesNoNoYesYesYes
Pretty DiffYesYesNoNoNoNoYesNo
TkdiffYesNoNoNoNoNo
Total Commander (compare)YesYesYesNoNoYesNoresync comparisonNo
vimdiffYesYes (via DirDiff plugin)YesYes
WinDiffYesYesYesYesNoNo
WinMergeYesYesYesYes (via Options)YesYesYesYes
NameShow
in-line
changes
Directory comparison
Binary
comparison
Moved lines3-way comparisonMergeStructured comparison[b]Manual compare alignment
Image
compare

API / editor features

[edit]
NameGUICLIScriptingHorizontal / verticalSyntax highlightingReports
Beyond CompareYesYesYesBothYesXML, HTML, CSV, Text, Unix Patch
Compare++YesYesBothYesHTML, Text(combined or side-by-side)
diffNoYesHorizontalYes pipe to diff-highlight[35]
diff3NoYesHorizontal
Eclipse (compare)YesVerticalYes
EdiffYesYeselispBothYes
ExamDiff ProYesYesoptionalYesUNIX, HTML, Diff
Far Manager (compare)YesYesYesYesNo
fcNoYesHorizontal
FileMerge (aka opendiff)YesYesVerticalYesNo
Guiffy SureMergeYesYesJava APIBothYesHTML, Text, Unix Patch
IntelliJ IDEA (compare)YesYesVerticalYes
jEdit JDiff pluginYesBothYes
Lazarus DiffYesYes
MeldYesNoYesNo
Notepad++ (compare)YesYesBothYesNo
Perforce P4MergeYesYesVerticalYesNo
Pretty DiffYesYesJavaScriptBothYesXHTML
TkdiffYes
Total Commander (compare)YesBothNoNo
vimdiffYesYesvim scriptBothYesHTML
WinDiffYesYesHorizontalNoText
WinMergeYesYesBothYesCSV, Tab-delimited, HTML, XML
NameGUICLIScriptingHorizontal / verticalSyntax highlightingReports

Other features

[edit]

Some other features which did not fit in previous table

NameZIP supportFTP supportSFTP supportVersion control browsingPatch creationPatch applicationPatch previewUnicode supportXML-aware
Beyond CompareYesYesYesSVNYesYesYesYes
Compare++SVN, CVS, Git, Microsoft TFS, Perforce, VSS using command lineYes
diffNoNoNoYesYes with patchYes with patchNoNo
diff3NoNoNo
Eclipse (compare)YesCVS,Subversion,Git,Mercurial,BaazarYes
EdiffYesYesRCS, CVS, SVN, Mercurial, git (anything supported by Emacs' VC-mode)[36]YesYesYes
ExamDiff ProYes[37]Yes[38]normal diff onlyYes
Far Manager (compare)NoNoNoNoNoNoYesNo
fcNoNoNo
FileMerge (aka opendiff)Nosupported by OSNoNoNo
Guiffy SureMergeYesYesYesYesYes[c]
IntelliJ IDEA (compare)YesYesYesYesYesYesYesYes
jEdit JDiff pluginYesYesYesYesYesYesYes
Lazarus Diff
MeldCVS,Subversion,Git,Mercurial,BaazarYesYes
Notepad++ (compare)NoYes[39]Git, Subversion (compare against base)NoNoNoYesNo
Perforce P4MergeNoYes
Pretty DiffNoNoNoNoNoNoNoYesYes
TkdiffNoNoCVS, RCS, SubversionNoNoNoNoNo
Total Commander (compare)YesYesYesNoNoNoNoYesNo
vimdiffYesYesYesYes
WinDiffNoNoNoNo
WinMergeYesNoMercurial,[40] Subversion,[41] Visual Source Safe, Rational ClearCase[42]YesYes
NameZIP supportFTP supportSFTP supportVersion control browsingPatch creationPatch applicationPatch previewUnicode supportXML-aware

Aspects

[edit]

What aspects can be / are compared?

NameFilename casingCRCFiledateDaylight savingCharacter casing
Beyond CompareYesYesYesYesYes
Compare++YesYesYesYes
diffYesNoNoNoOptional
diff3
Eclipse (compare)
Ediff
ExamDiff ProNoYesYesYesYes
Far Manager (compare)YesNoYesNoYes
fcNoOptional
FileMerge (aka opendiff)NoNoNoOptional
Guiffy SureMergefilesystem dependentYesYes
IntelliJ IDEA (compare)
jEdit JDiff plugin
Lazarus Diff
Meld
Notepad++ (compare)NoNoNoYes
Perforce P4MergeNoNoNoYes
Pretty DiffNoNoNoOptional
Tkdiff
Total Commander (compare)OptionalYes (in synchronize only)Optional
vimdiffNoNoNoNoYes
WinDiffNoNowhen differentYesOptional
WinMergeNoNoOptionalOptional
NameFilename casingCRCFiledateDaylight savingCharacter casing

Time zone effects

[edit]

When files are transferred across time zones and between MicrosoftFAT andNTFSfile systems, the timestamp displayed by the same file may change, so that identical files with different storage histories are deemed different by a comparer that requires the timestamps to match. The difference is an exact number of quarters of an hour up to 95 (same minutes modulo 15 and seconds) if the file was transported across zones; there is also a one-hour difference within a single zone caused by the transition between standard time anddaylight saving time (DST). Some, but not all, file comparison and synchronisation software can be configured to ignore the DST and time-zone differences.[d] Software known to have daylight-saving compensation is marked in theAspects table.

See also

[edit]

Notes

[edit]
  1. ^Ediff requires adiff utility to function. As of December 2017, diff is not bundled with Emacs or Windows, so use of Ediff in a Windows environment requires installation of both Emacs and a diff implementation like GNU diff.
  2. ^abCompare logical sections (class, methods).
  3. ^UTF8, UTF16, MBCS, SJIS, over 150 file encoding and character set formats.
  4. ^Example: "Beyond Compare" help describes a user setting "timezone differences – ignores timestamp differences that are multiples of an exact hour."

References

[edit]
  1. ^Scooter Software
  2. ^"Coode Software". Archived fromthe original on 2018-12-21. Retrieved2020-12-13.
  3. ^Compare++ Operating system information
  4. ^Michael Kifer
  5. ^PrestoSoft
  6. ^"Far2l".GitHub. 26 July 2022.
  7. ^Microsoft
  8. ^NeXT Product Marketing (Fall 1993)."What's New in Release 3.2?".NEXTSTEP in Focus.3 (4). NeXT Computer, Inc. Retrieved18 July 2014.
  9. ^Guiffy Software
  10. ^JetBrains
  11. ^jedit.org
  12. ^Stephen Kennedy
  13. ^Meld/Windows
  14. ^Notepad++ compare plugin
  15. ^Pretty Diff
  16. ^tkdiff
  17. ^Christian Ghisler
  18. ^Bare Bones Software, Inc.
  19. ^vim license
  20. ^Microsoft
  21. ^Dean Grimm
  22. ^"Release v2.16.42.1 · WinMerge/Winmerge".GitHub.
  23. ^abWinMerge in Wine
  24. ^"KDE SDK Project Page".KDE Invent: KDE SDK. Retrieved2023-03-09.
  25. ^"KDiff3".KDE Applications. Retrieved2023-03-09.
  26. ^"The KDiff3 Handbook".docs.kde.org. Retrieved2023-03-09.
  27. ^"KDE KDiff3". Retrieved2023-03-09.
  28. ^"KDevelop / KDevelop · GitLab (full KDevelop project)".GitLab. Retrieved2023-03-09.
  29. ^"Using KDiff3 as a Git Diff and Merging Tool".docs.kde.org. Retrieved2023-03-09.
  30. ^"FreeBSD/Setup/Ports - KDE Community Wiki".community.kde.org. Retrieved2023-03-09.
  31. ^"pkgsrc.se | The NetBSD package collection".pkgsrc.se. Retrieved2023-03-09.
  32. ^Examdiff
  33. ^Examdiff
  34. ^abVisual Compare
  35. ^"Git/Contrib/Diff-highlight at master · git/Git".GitHub.
  36. ^gnu.org Support-for-Version-Control
  37. ^through a plug-in
  38. ^through a plug-in
  39. ^Notepad++ FTP plugin
  40. ^"tortoisehg / stable / wiki / FAQ —". Bitbucket.org. Archived fromthe original on 2010-07-15. Retrieved2010-07-06.
  41. ^"Using WinMerge with other tools – WinMerge 2.12 Manual". Winmerge.org. Archived fromthe original on 2010-07-10. Retrieved2010-07-06.
  42. ^"About". WinMerge. Archived fromthe original on 2010-07-03. Retrieved2010-07-06.
Retrieved from "https://en.wikipedia.org/w/index.php?title=Comparison_of_file_comparison_tools&oldid=1319441678"
Categories:
Hidden categories:

[8]ページ先頭

©2009-2025 Movatter.jp