Fixed issue #933: implement git stash --include-untracked
[TortoiseGit.git] / src / TortoiseProc / DeleteConflictDlg.h
blob44b8b4d904c706c46147cdae7907a332245a3ad1
1 #pragma once
3 #include "StandAloneDlg.h"
4 // CDeleteConflictDlg dialog
6 class CDeleteConflictDlg : public CResizableStandAloneDialog
8 DECLARE_DYNAMIC(CDeleteConflictDlg)
10 public:
11 CDeleteConflictDlg(CWnd* pParent = NULL); // standard constructor
12 virtual ~CDeleteConflictDlg();
14 // Dialog Data
15 enum { IDD = IDD_RESOLVE_CONFLICT };
17 protected:
18 virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
19 BOOL OnInitDialog();
20 DECLARE_MESSAGE_MAP()
22 public:
23 CString m_LocalStatus;
24 public:
25 CString m_RemoteStatus;
26 BOOL m_bShowModifiedButton;
27 CString m_File;
28 BOOL m_bIsDelete;
29 public:
30 afx_msg void OnBnClickedDelete();
31 public:
32 afx_msg void OnBnClickedModify();