I used to use Diffmerge for my merge/comparison needs, however I find the outdated interface to be unfriendly and ugly to look at.

A free visual Git and Hg client for Mac and Windows SourceTree simplifies how you interact with your Git and Mercurial repositories so you can focus on coding. Visualize and manage your. SourceTree is a free Git and Hg client for Windows and Mac. SourceTree can bring everyone up to speed with Git and Mercurial. Create, clone, commit, push, pull, merge, and more are all just a click away. In Mac, when you install Xcode you get a diff tool named FileMerge, simple but sufficient in most of the cases. You can try WinMerge for Windows, I've used it in the past and it's pretty nice, and open source. You can also try the P4 Merge tool from Perforce which is offered for free.

On Windows I use Sourcetree and Beyond Compare works without integration, it shows up in the appropriate dropdowns but on Mac it does not. I don’t understand why Sourcetree on Mac is different to Windows, but anyway.

Fortunately, Sourcetree makes it easy to use third party comparison tools even if they are not in the dropdowns.

Atlassian Sourcetree is a powerful Git and Mercurial desktop client for developers using Mac or Windows. Say goodbye to the command line and use the full capabilities of Git and Hg through Sourcetree’s beautifully simple interface. Install Sourcetree Go to the Sourcetree website and click the download button. From the ZIP file you download, click the application file (EXE for Windows or DMG for Mac) to download. After you install, you'll have to agree to the Atlassian Customer Agreement and hit Continue. Download SourceTree-Beta 3.0 for Mac from our software library for free. The latest setup file that can be downloaded is 56.1 MB in size. The program relates to Developer Tools. This free Mac application is an intellectual property of Torus Knot Software Ltd. Our antivirus analysis shows that this Mac download is virus free. On Windows I use Sourcetree and Beyond Compare works without integration, it shows up in the appropriate dropdowns but on Mac it does not. I don’t understand why Sourcetree on Mac is different to Windows, but anyway. Fortunately, Sourcetree makes it easy to use third party comparison tools even if they are not in the dropdowns.

Firstly, we need to install Beyond Compare “Command Line Tools” which allows us to call Beyond Compare.

Go into the Beyond Compare menu and choose Install Command Line Tools.

Secondly we need to configure Sourcetree to use the command line for Beyond Compare:

In Preferences and then the “Diff” tab, at the bottom there is a section which allows you to specify the compare tool.

Sourcetree Download

Full-powered DVCSDownload android 6 for htc one me.

Say goodbye to the command line – use the full capability of Git and Mercurial in the SourceTree desktop app. Manage all your repositories, hosted or local, through SourceTree's simple interface.

Perfect for newcomers

Simplify DVCS for your team. SourceTree can bring everyone up to speed with Git and Mercurial. Create, clone, commit, push, pull, merge, and more are all just a click away.

Powerful enough for experts

Make advanced Git and Mercurial devs even more productive. Review your outgoing and incoming changesets, cherry-pick between branches, patch handling, rebase, stash, shelve, and much more.

Git-flow and Hg-flow out of the box

Use Git-flow and Hg-flow with ease. Keep your repositories cleaner and your development more efficient with SourceTree's intuitive interface to Git and Hg's 'branchy' development model. A consistent development process, right out of the box.

What's New:

• Mac version updated to 4.0.2
• Windows version updated to 3.3.9

Sourcetree For Mac 10.13.6

• 57 votes
  GitHub Desktop is a seamless way to contribute to projects on GitHub and GitHub Enterprise.

  • Freeware
  • Windows/macOS
• 13 votes
  SmartGit is a graphical Git client with support for GitHub, Bitbucket and GitLab. SmartGit runs on Windows, macOS and Linux.

  • Freeware
  • Windows/macOS
• 14 votes
  The legendary Git GUI client for Windows, Mac and Linux.

  • Freeware
  • Windows/macOS/Linux