Added Support for an external merge application. For this purpose, WinMerge has been tested and found working.
Authored by: calmera 2008-10-16
Parent: [r126]
Child: [r128]