Sometimes PhpStorm is a bit too slick for its own good. For example, it includes a different utility for showing differences between a local file and its server-side copy. This dialogue lets you merge changes from the server side, but this is shown vi...
