Index: TortoiseMerge.cpp
===================================================================
--- TortoiseMerge.cpp	(revision 24957)
+++ TortoiseMerge.cpp	(working copy)
@@ -183,6 +183,13 @@
     // visual styles.  Otherwise, any window creation will fail.
     InitCommonControls();
 
+		// MFC is disrespectful of user settings and uses a segoe font with cleartype enabled regardless of the user preferences for cleartype.
+		// for more information : http://connect.microsoft.com/VisualStudio/feedback/details/780747
+		// By setting the following flag, we can tell MFC to be respectful
+		GetGlobalData()->m_bUseSystemFont = TRUE;
+		// Additionally, this must be called to re-select the font after setting the flag
+		GetGlobalData()->UpdateFonts();
+
     CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerWindows));
     CMFCButton::EnableWindowsTheming();
     EnableTaskbarInteraction(FALSE);