Sync TortoiseMerge/MainFrm.cpp from TortoiseSVN revision 24088

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>