Fixed Issue #138: "Format patch" in "Show log" dialog doesn't work
[TortoiseGit.git] / src / TortoiseProc / MergeDlg.h
blob2967bb0d809b20805dec7a5a65bdf1e091cb8598
1 #pragma once
3 #include "StandAloneDlg.h"
4 #include "HistoryCombo.h"
5 #include "ChooseVersion.h"
6 // CMergeDlg dialog
8 class CMergeDlg : public CResizableStandAloneDialog,public CChooseVersion
10 DECLARE_DYNAMIC(CMergeDlg)
12 public:
13 CMergeDlg(CWnd* pParent = NULL); // standard constructor
14 virtual ~CMergeDlg();
16 // Dialog Data
17 enum { IDD = IDD_MERGE };
19 BOOL m_bSquash;
20 BOOL m_bNoFF;
22 //CString m_Base;
25 protected:
26 virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
27 virtual BOOL OnInitDialog();
29 DECLARE_MESSAGE_MAP()
30 CHOOSE_EVENT_RADIO() ;
31 public:
33 afx_msg void OnBnClickedOk();