It is part of KDE Applications and therefore primarily used on Linux and other Unix-like operating systems, as well as Windows. It allows users to compare two different text files or two directories. Kompare is a graphical diff and merge tool targeting developers. Xxdiff is a graphical browser for viewing the differences between two or three files, or between two directories, and can be used to produce a merged version. It provides a easy to understand GUI for comparing files, directories, and merging files. Kdiff3 is an open source file comparison tool supported on Windows, OSX, and various flavors of Unix/Linux.

This is a nice way to inspect changes and to move changes from one version to another version of the same file. The differences between the files are highlighted. Vimdiff starts Vim on two (or three or four) files. Vimdiff – edit two, three or four versions of a file with Vim and show differences.

… git gui is known to work on all popular UNIX systems, Mac OS X, and Windows (under both Cygwin and MSYS). Git gui focuses on allowing users to make changes to their repository by making new commits, amending existing ones, creating branches, performing local merges, and fetching/pushing to remote repositories. Gitk is easiest to invoke from the command-line. This is the tool to use when you’re trying to find something that happened in the past, or visualize your project’s history. Think of it like a powerful GUI shell over git log and git grep.

Three way merge tool windows