Projects tagged ‘diff’ and ‘merge’

WinMerge is a tool for visual difference display and merging, for both files and directories. It is highly useful for determing what has changed between file versions, and then merging those changes. ... [More] WinMerge has Unicode support, Flexible syntax coloring editor, Visual SourceSafe integration, and Windows Shell integration. Regexp filtering for filenames and lines. Side-by-side line difference and highlights differences inside lines. A file map shows the overall file differences in a location pane. The user interface is translated into several languages. [Less]

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 ... [More] browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial. [Less]

KDiff3 is a graphical text difference analyzer for up to 3 input files, provides character-by-character analysis and a text merge tool with integrated editor. It can also compare and merge directories. Platform-independant.

Kdiff-ext is a KDE's Konqueror context menu extension. It adds commands to launch file comparison/merge tools. It also remembers your selection so you can run comparison/merge later on. Use ... [More] kdiff-ext with KIO supporting file comparison tool such as Kompare to compare remote files. [Less]

Diff-ext is a Windows Explorer context menu extension. It adds commands to launch file comparison/merge tools. It also remembers your selection so you can run comparison/merge later on.

gdiff-ext is a Gnome's Nautilus context menu extension. It adds commands to launch file comparison/merge tools. It also remembers your selection so you can run comparison/merge later on.

Qindiff is a web based diff utility with merge function. It is implemented with LCS algorithm using Dynamic Programming. Screen Shots

This project provides several tools that can be used to merge files in version control systems. Compared to the traditional 3-way line-based merging tools, we provide an efficient hierarchical merge ... [More] framework that can merge different file versions at the finest granule without decreasing the performance. [Less]

With many diff/merge options from many different development arenas, merging version control branches can be a breeze. Though, with any combination of user skill-level, version control systems ... [More] , configurations, and front-ends, and open source and commercial diff/merge applications, achieving simple and effective merges is something of a crap-shoot. JavaDiff aims to very simply solve one very specific problem: detecting differences, merging, and resolving conflicts in Java source files. [Less]

A file and directory merging tool.