Sublimerge Pro

Side-by-side tool to diff and merge files and directories. Supports Git, SVN and Mercurial.