Plugin: Mergely - integrated Diff/Merge

[Aivars]

As you know, WeBuilder/Rapid PHP allows comparing files using configured external Diff tool. This plugin allows doing the same without installing WinMerge or other application.

Features:
- view document changes since opening (might not work correctly after plugin has been just installed without restarting IDE)
- compare document to another document
- merge changes and apply merged changes



Mergely is from http://www.mergely.com/.
Have fun using this plugin! I wrote it during the weekend while I was sick with flu and I needed something fun to occupy myself with.

Update 1.1: supports files opened from FTP