Enable Sync Dialog Resize

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / MergeDlg.h

diff --git a/src/TortoiseProc/MergeDlg.h b/src/TortoiseProc/MergeDlg.h
index 95a93d2..2967bb0 100644 (file)
--- a/src/TortoiseProc/MergeDlg.h
+++ b/src/TortoiseProc/MergeDlg.h
@@ -5,7 +5,7 @@
 #include "ChooseVersion.h"\r
 // CMergeDlg dialog\r
 \r
-class CMergeDlg : public CResizableStandAloneDialog,CChooseVersion\r
+class CMergeDlg : public CResizableStandAloneDialog,public CChooseVersion\r
 {\r
        DECLARE_DYNAMIC(CMergeDlg)\r
 \r
@@ -19,7 +19,7 @@ public:
        BOOL m_bSquash;\r
        BOOL m_bNoFF;\r
 \r
-       CString m_Base;\r
+       //CString m_Base;\r
 \r
 \r
 protected:\r