Git

 

Gui

Best Merge

Best Free

Best Diff

Best Web

Best Windows