What are the best merge applications for Git?

Platforms:Linux; Windows; Mac (unofficial)

License:Free and Open Source

Platforms:Linux, Mac, Windows

Pro Features:Conflict Solver and Compare (freely editable); Pull Requests, Comments for BitBucket, GitHub and provider independent (Distributed Review add-on); Git-Flow; highly configurable views, external tools

Issue Tracker support:Atlassian JIRA

Pull Request/Comments support:Atlassian Stash, BitBucket, GitHub, own Git server (Distributed Review add-on)

Platforms:Windows, Linux, Mac

Platforms:Windows; Mac; Linux

License:Proprietary

Release Date:October 19, 2023

Platforms:Windows; Mac; Linux

License:Free

Platforms:Windows, Linux, Mac

Platforms:Windows, macOS, Linux

Integrations:GitHub, Bitbucket, GitLab, Azure DevOps, Bitbucket Server, Jira Issues, GitKraken Boards Issues

Platforms:Linux, macOS, Windows, Cygwin

License:Vim License

Extension language:Vim

Price:0

Platforms:Mac

License:Proprietary

Pricing Model:Subscription ($8/month)

Platforms:Windows

License:Free and Open Source

Platforms:Any supported by Emacs (Linux, Windows,macOS,*BSD...)

License:GPLv3

Platforms:Windows, macOS, Linux

License:MIT, Proprietary (official builds)

Multi Language Support:Yes

Auto Complete:Yes

Platforms:Windows, Linux, Mac

Git:Yes

SVN:No

Mercurial:No

Platforms:Windows, Mac

Platforms:Windows

License:FREE/$49,95

Dev platforms:Windows

VCS Integration:TortoiseSVN, TortoiseHg, TortoiseGit, Team Foundation Server, SmartSVN, Mercurial, Git, Visual SourceSafe 2005, AnkhSVN, RapidSVN, Perforce

Multi Language Support:Yes

Auto Complete:Yes

Integrated Debugger:Yes

Cross Platform:Windows, macOS