1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2007-2009 - TortoiseGit
5 // This program is free software; you can redistribute it and/or
6 // modify it under the terms of the GNU General Public License
7 // as published by the Free Software Foundation; either version 2
8 // of the License, or (at your option) any later version.
10 // This program is distributed in the hope that it will be useful,
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 // GNU General Public License for more details.
15 // You should have received a copy of the GNU General Public License
16 // along with this program; if not, write to the Free Software Foundation,
17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
23 #include "StandAloneDlg.h"
24 #include "HistoryCombo.h"
25 #include "ChooseVersion.h"
29 class CMergeDlg
: public CResizableStandAloneDialog
,public CChooseVersion
, public CSciEditContextMenuInterface
31 DECLARE_DYNAMIC(CMergeDlg
)
34 CMergeDlg(CWnd
* pParent
= NULL
); // standard constructor
38 enum { IDD
= IDD_MERGE
};
45 CString m_MergeStrategy
;
46 CString m_StrategyOption
;
47 CString m_StrategyParam
;
52 virtual void DoDataExchange(CDataExchange
* pDX
); // DDX/DDV support
53 virtual BOOL
OnInitDialog();
55 CSciEdit m_cLogMessage
;
56 ProjectProperties m_ProjectProperties
;
58 TCHAR
* m_pDefaultText
;
60 CHOOSE_EVENT_RADIO() ;
63 CString m_strLogMesage
;
65 afx_msg
void OnBnClickedOk();
66 afx_msg
void OnDestroy();
67 afx_msg
void OnBnClickedCheckMergeLog();
68 afx_msg
void OnCbnSelchangeComboMergestrategy();
69 afx_msg
void OnCbnSelchangeComboStrategyoption();