For code reviewers and auditors: identify in context every change made between two or three source code hierarchies.Copy text from other applications (such as Microsoft Word) and paste it directly into a text comparison. Directly open and compare the text from Microsoft Office (Word and Excel), OpenDocument, PDF, and RTF files. For legal and publishing professionals: instantly identify every change between different contracts or manuscript drafts.Araxis Merge is a software program that has been created specifically in order to help you visually compare, merge, and synchronize text files and folders. Join tens of thousands of other pros using Araxis software. My only annoyance is that it is a little difficult to compile if it isn't present in your favorite distro repository.Take control. See:Īn advanced feature is to use regular expressions for defining automatic merges. You can also use it compare and merge directories. The merged file is editable, so you can fine tune after merge conflicts. 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 my list of favorite open source software. Side note: you can also experiment with Git merge strategies It is possible to integrate it with Tortoise and with your linux shell. There's versions for Windows and Linux with the same interface. I recommend to configure it as Git mergetool or to use a nice Git frontend as GitExtensions.Įven when Git/Subversion indicates a conflict, Kdiff3 solves it automatically. Kdiff3 conflict resolution algorithm is really impressive and it nicely integrates with Git.

Araxis merge free