notify: fix neglect of custom headers set via template
e981725da3fe introduced a bug that discarded all custom headers.
Add custom header to test template.
Update win32 merge tools configuration
Add WinMerge and Beyond Compare 3 to default merge tools configuration.
Fix TortoiseMerge configuration.