Search Results for "merge diff"

WinMerge is a Windows tool for visual difference display and merging, for both files and directories. It is highly useful for determining what has changed between file versions, and then merging those changes. 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...

tkdiff is a graphical front end to the diff program. It provides a side-by-side view of the differences between two text files, along with several innovative features such as diff bookmarks, a graphical map of differences for quick navigation, and a facility for slicing diff regions to achieve exactly the merge output desired.

Eclipse comes with an internal diff / compare editor, but if you prefer a third-party one, this plugin opens an external merge or diff tool for you. After you open two versions of a file in the internal eclipse compare editor, this plugin either opens an external diff tool automatically or you can choose that this plugin opens the external diff tool after you press a button in the toolbar of the internal compare editor. Furthermore the plugin can (optional) format java code before...

YaDT - Yet another Diff Tool. It is another front-end for diff and in earlier versions diff3 utility. With YaDT you can compare and merge 2 and/or 3 files. YaDT is written on Tcl/Tk and wrapped in a single executable file with the help of sdx and tclkit. diff and cvs utilities are embedded inside YaDT. Also, YaDT supports Git and Mercurial repositories, but git and hg are not embedded inside YaDT, you should have git/hg executable in your path environment.

A tool for diff, patch and 3-way merge of XML files.

JMeld is a visual diff and merge tool. It is build to be fast with large files and runs on any operating system. Development on sourceforge has stopped. The project continues at github. https://github.com/MrKuip/JMeld

WinMergeX is a branch of the WinMerge visual diff tool. It is a MS-Windows diff tool allowing merge of individual files.

A Java based tool used to diff and merge two directories. Directory merges can be done between master and consumer directories or two master directories. LDAP Merge operates through either a command line interface or a Java Swing GUI.