Version Control

Beyond Compare

Professional file and folder comparison tool with powerful merging capabilities

GitKraken

Powerful visual Git client for developers and teams

Gogs

A painless self-hosted Git service built for simplicity

Meld

Visual diff and merge tool for developers

SmartGit

Powerful cross-platform Git GUI with built-in conflict resolver and Git-Flow support

Sublime Merge

Lightning-fast Git client from the makers of Sublime Text