Projects tagged ‘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]

Unison is a file-synchronization tool for Unix and Windows, written in OCaml. It allows two replicas of a collection of files and directories to be stored on different hosts, modified separately, and ... [More] then brought up to date by propagating the changes in each replica to the other. Unison offers several advantages over various synchronization methods such as CVS, Coda, rsync, Intellisync, etc. Unison can run on and synchronize between Windows and many UNIX platforms. Unison can synchronize changes to files and directories in both directions, on the same machine, or across a network using ssh or a direct socket connection. Transfers are optimised using a version of the rsync protocol, has a clear and precise specification, and is resilient to failure due to its careful handling of replicas. [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.

EMF Compare brings model comparison to the EMF framework. It provides generic support for any kind of metamodel in order to compare and merge models. This component will ultimately provide a stable ... [More] and efficient generic implementation of model comparison along with an extensible framework for specific comparison needs. [Less]

PDF Split and Merge is an easy to use tool to merge and split pdf documents. Console and GUI versions are available. The GUI is written in Java Swing and it provides functions to select files and set options. It's made over the iText library.

This is a hosting for several CakePHP assets. Current assets : FlashChartHelper FlashHelper OrderedBehavior DraftedBehavior LogableBehavior RevisioBehavior MultilingualBehavior MergeBehavior CounterHelper DummyData

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]

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.

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.