Set the header encoding when creating a unified diff.
(Fixes issue #486) : Assert when creating a unified diff


git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24425 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Initialize the context menu manager: it's required for the system menu.
(Fixes issue #493) : Ribbon system menu not working


git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24449 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Fix endless loop when undoing the bottom view

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24458 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac