I used to use Diffmerge for my merge/comparison needs, however I find the outdated interface to be unfriendly and ugly to look at.
On Windows I use Sourcetree …
Posts in Command Line
When it comes to working with your servers (or any remote machine for that matter), public key encryption is a must. The basics are: you register a public key …