Furthermore, the application provides quick options for copying missing contents from one place to another or to delete them. As previously mentioned, you may compare text files, pictures and folders and perform binary comparisons as well.Īll differences between files and folders are highlighted, to make them easy to spot. What's more, you can bring another panel, if you wish to perform a three-way comparison and figure out if certain contents came from the same location. The user interface consists of two identical panels, on which you can load files or folders for comparison. You don't have to meet any special requirements and you won't sacrifice too many resources for this program. It is available for Windows and Mac OS X platforms and it can be installed in under a minute, without any difficulties. The software is not free, but you can request an activation key for a fully functional, 30-day trial. It allows you to perform side by side text, binary, image and folder comparisons and it places many useful tools at your disposal, for merging folders and performing other components. Araxis Merge can help you spot even the slightest difference between files and folders. Hunting down subtle differences can be a tedious chore if you compare the contents in Windows Explorer or in your default text editor. My only annoyance is that it is a little difficult to compile if it isn't present in your favorite distro repository.If you are looking for a way to waste time, then you should try comparing two images, text files or the contents of two folders. 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.
0 kommentar(er)
