My only annoyance is that it is a little difficult to compile if it isn't present in your favorite distro repository. See:Īn advanced feature is to use regular expressions for defining automatic merges. You can also use it compare and merge directories. In Windows, it has a nice integration with windows explorer: select two files and right click to compare them, or right click to 'save to later' a file, and then select another one to compare. It also solves almost all the ClearCase conflicts. You can configure it as the default diff tool in Subversion, Git, Mercurial, and ClearCase. One of the first tools I install in any machine. It is in the list of my favorite open source software. It is possible to integrate it with Tortoise and with your linux shell. There's versions for Windows and Linux with the same interface.

WinMerge can compare both folders and files, presenting differences in a visual text. Kdiff3 conflict resolution algorithm is really impressive.Įven when subversion indicates a conflict, Kdiff3 solves it automatically. WinMerge is an open source differencing and merging tool for Windows.

Winmerge alternative 2019