Guiffy is a diff merge tool and folder compare application and API. SureMerge is the most trustworthy source code 3-way merge tool available. Advanced features include tuneable inline diff highlighting, syntax highlighting and a blend of 3 diff algorithms.
↧
Guiffy SureMerge
↧
Meld
Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial. Written with Python and GTK.
Requirements:
Python 2.6
GTK+/pygtk 2.14
GLib/pygobject 2.16
GtkSourceView/pygtksourceview 2.10 (optional)
↧
↧
Diff Doc
Compare Files Using ' Diff Doc' a visual file compare and folder compare utility that creates a detailed file diff. File comparison can optionally be done with the command line. Compare Word and Compare XLS files in addition to PDF, txt, rtf, htm
↧
Meld - Mac Port
↧
FileMerge
FileMerge is part of http://alternativeto.net/software/xcode/ .
FileMerge lets you compare one file to another or one directory to another. For a more accurate comparison, you can compare two files or directories to a common ancestor. After comparing, you can merge the files or directories together.
↧
↧
Workshare Compare
Workshare Compare is the leading document comparison software that lets you perform file comparison of two documents against multiple modified versions.
Workshare makes the process of editing, revising and comparing documents fast and efficient. Professional teams are able to compare multiple, lengthy, and complex documents quickly, with the highest level of accuracy. Comparisons are shown as a Workshare DeltaView, the industry standard for easy-to-read and accurate redlines.
↧
GumTreeDiff
It includes possibilities such as:
* converting a source file into a language-agnostic tree format
* export the produced trees in various formats
* compute the differences between the trees
* export these differences in various formats
* visualize these differences graphically
You can read a paper in https://dx.doi.org/10.1145/2642937.2642982
↧
WinMerge JP
↧
Diffinity
Diffinity is a diff and merging tool with focus on accurate and easy to read source code diffs. It will compare the content of two files and present the differences in an easy to read line by line and char by char basis.
Features:
- Improved diffing quality for xml and c-style source code
- Thumbnail view of all diffs
- Differentiates between changed, removed and added lines
- Instance highlighting - double click or search for a word to show all instances of it
- Syntax highlighting
- Supports unicode and auto detects encoding (and warns if encoding mismatch)
- Customizable interface
- In line diffs live updated as you type
- Windows Explorer shell integration
↧
↧
ApexSQL Compare
ApexSQL Compare is a tool that can compare files, SQL Server objects, and folders. It can be integrated as an add-in into SQL Server Management Studio and Visual Studio or it can be used as a desktop application. Automation and scheduling can be performed via Command Line Interface. It can perform two-way script comparison and create a merge script. Three comparison modes include Character, Line and Block, along with the appropriate syntax highlighting.
Features:
- Supports SQL Server Management Studio 2012 integration and higher
- Supports Visual Studio 2010 integration and higher
- Supports Windows Explorer integration
- Supports SQL Server 2005 and higher
- Supports Azure SQL Database
- Supports SQL Server on Amazon RDS
- Supports file and folder comparison
- Compare SQL Server objects directly from SQL Server Management Studio and Visual Studio
- Two-way comparison and merge
- Three comparison modes:
- Character
- Line
- Block
- Syntax highlighting for 9 languages:
- C#
- C++
- HTML
- JavaScript
- PostgreSQL
- Python
- T-SQL
- Visual Basic
- XML
- Ignore options for the comparison process
- Ansi options
- Authorization
- Collation
- Comments
- Constraint names
- Filegroups
- Indexes
- Lock escalation
- Permissions
- With encryption
- Export comparison results into HTML report
- Command line interface
- GUI themes
↧