Fixed issue #1500: Support git merge --log option
[TortoiseGit.git] / src / TortoiseProc / MergeDlg.h
blobb85293ddbabaf090565040d1b6ac08779ee23501
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.
21 #pragma once
23 #include "StandAloneDlg.h"
24 #include "HistoryCombo.h"
25 #include "ChooseVersion.h"
26 #include "SciEdit.h"
27 // CMergeDlg dialog
29 class CMergeDlg : public CResizableStandAloneDialog,public CChooseVersion , public CSciEditContextMenuInterface
31 DECLARE_DYNAMIC(CMergeDlg)
33 public:
34 CMergeDlg(CWnd* pParent = NULL); // standard constructor
35 virtual ~CMergeDlg();
37 // Dialog Data
38 enum { IDD = IDD_MERGE };
40 BOOL m_bSquash;
41 BOOL m_bNoFF;
42 BOOL m_bNoCommit;
43 BOOL m_bLog;
44 int m_nLog;
45 //CString m_Base;
48 protected:
49 virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
50 virtual BOOL OnInitDialog();
52 CSciEdit m_cLogMessage;
53 ProjectProperties m_ProjectProperties;
55 TCHAR * m_pDefaultText;
56 DECLARE_MESSAGE_MAP()
57 CHOOSE_EVENT_RADIO() ;
59 public:
60 CString m_strLogMesage;
62 afx_msg void OnBnClickedOk();
63 afx_msg void OnDestroy();
64 afx_msg void OnBnClickedCheckMergeLog();