Allow to use libgit2 for unified diff
[TortoiseGit.git] / src / TortoiseProc / DeleteConflictDlg.h
blob904f7c3b0ef9d5c4d4efc9d1c9732d67e1385b6d
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2009-2011 - 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.
19 #pragma once
21 #include "StandAloneDlg.h"
22 // CDeleteConflictDlg dialog
24 class CDeleteConflictDlg : public CStandAloneDialog
26 DECLARE_DYNAMIC(CDeleteConflictDlg)
28 public:
29 CDeleteConflictDlg(CWnd* pParent = NULL); // standard constructor
30 virtual ~CDeleteConflictDlg();
32 // Dialog Data
33 enum { IDD = IDD_RESOLVE_CONFLICT };
35 protected:
36 virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
37 afx_msg void OnBnClickedDelete();
38 afx_msg void OnBnClickedModify();
39 BOOL OnInitDialog();
40 DECLARE_MESSAGE_MAP()
42 public:
43 CString m_LocalStatus;
44 CString m_RemoteStatus;
45 BOOL m_bShowModifiedButton;
46 CString m_File;
47 BOOL m_bIsDelete;