GUI Clients Git comes with built-in GUI tools for committing ( git-gui ) and browsing ( gitk ), but there are several third-party tools for users looking for platform-specific experience. If you want to add another GUI tool to this list, just follow the instructions. I'm trying to use Araxis Merge as my diff / merge tool for MSYSGit. I found a few resources on the net: On the Araxis site, they mention an 'easy' way, but it implies a executables (araxisgitdiff.exe and araxisgitmerge.exe) that are not part of my distro. One of the few diff tools that works with more than just text and image files, Araxis Merge lets you also compare office documents (like MS Word, Excel, Powerpoint, or ODF). For people working on both Windows and Mac, it's great to know that a single license is valid for both platforms.
I'm not sure I completely understand. People here seem to be asking for three-way merge, but it seems like VSCode already has a three-way merge, as in this screenshot.
However, as I understand it, there's no way to invoke the three-way merge from the command line. As the initial posting mentioned, this would involve a way to invoke with four arguments on the command line: the base file, the two different revised versions, and the path to write the final merged result.
In my case I'm wanting to use VSCode as a merge tool with Perforce and not Git, but assuming VSCode accepted these four filenames on the command line then it wouldn't really matter which source control software you are using, the concept of merging is the same.
Should this issue be called something like 'Add command line option for invoking the existing 3-way merge functionality', or is there something that I'm misunderstanding about the current merge implementation in VSCode, besides lacking command line usage, that makes it unsuitable for git three way merges?
Meld
Being free and open source, Meld is a very popular tool on Windows. It supports three-way comparing and merging and lets you edit files directly from the comparison view. Apart from diffing files, Meld also supports comparison of folders.
Beyond Compare
The Beyond Compare team makes a fine diff tool for Windows (as well as Mac and Linux, by the way). It goes well beyond (pun intended) diffing simple text and also allows comparing PDF, Excel and image files. The 'Pro' version also includes a solid three-way merge.
Araxis Merge
Just like Beyond Compare, Araxis Merge supports more than just text and image files. It lets you also compare office documents (like MS Word, Excel, Powerpoint, or ODF). For people working on both Windows and Mac, it's good to know that a single license is valid for both platforms.
KDiff3
Another free and open source tool answers to the name of KDiff3. The project hasn't see many updates in recent years, but it remains a solid diff and merge tool that should satisfy basic needs.
Get the Git Cheat Sheet
Download one of the web's most popular resources on Git! It's free!
DeltaWalker
Much like Araxis, the DeltaWalker diff tool also lets you compare office files. However, it goes one step further by letting you compare file archives like ZIP, JAR, and TAR files. If you're regularly performing comparisons on a folder basis, it's good to know that DeltaWalker shines with great performance in this area.
P4Merge
Perforce, the company best known for its enterprise version control platform, also offers a solid diff tool: P4Merge is free of charge and comes with a basic feature set that makes it an interesting option.
Code Compare
Besides offering all the standard diff and merge capabilities, Code Compare comes with some special features like syntax highligthing and a VisualStudio integration.
The basic version can be used free of charge, while the Professional Edition delivers the full feature set.
Integrations
Another aspect to watch out for is integrations: before choosing your favorite tool, you should make sure that it plays nicely with the rest of your tool chain. I can already confirm that most of the mentioned tools work seamlessly with Tower, our own Git client.
If you don't need the power of a dedicated Diff tool application, the integrated diff views in Tower might even be sufficient for you:
Good Diff Merge Tool For Mac Vs Gittigidiyor
See for yourself and try it 30 days for free.
Best Git Tools
Conclusion
Diff & merge apps are amongst the most underestimated tools. But a good one can be really helpful in a lot of situations. Try one of the above and see for yourself!
Best Git Merge Tool Windows
Get the Git Cheat Sheet
Good Diff Merge Tool For Mac Vs Github
Download one of the web's most popular resources on Git! It's free!