From a952cd2defd8ef92410a3d193b50f68894e1b5e4 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 1 Dec 2012 14:13:45 +0100 Subject: [PATCH] Don't show "Restore after commit", "Export to" and "Save revision as" in Resolve Dialog Signed-off-by: Sven Strickroth --- src/TortoiseProc/ResolveDlg.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TortoiseProc/ResolveDlg.cpp b/src/TortoiseProc/ResolveDlg.cpp index ee5b13d01..737873f69 100644 --- a/src/TortoiseProc/ResolveDlg.cpp +++ b/src/TortoiseProc/ResolveDlg.cpp @@ -57,7 +57,7 @@ BOOL CResolveDlg::OnInitDialog() CResizableStandAloneDialog::OnInitDialog(); CAppUtils::MarkWindowAsUnpinnable(m_hWnd); - m_resolveListCtrl.Init(GITSLC_COLEXT, _T("ResolveDlg"), GITSLC_POPALL ^ (GITSLC_POPIGNORE|GITSLC_POPADD|GITSLC_POPCOMMIT)); + m_resolveListCtrl.Init(GITSLC_COLEXT, _T("ResolveDlg"), GITSLC_POPALL ^ (GITSLC_POPIGNORE|GITSLC_POPADD|GITSLC_POPCOMMIT|GITSLC_POPEXPORT|GITSLC_POPRESTORE|GITSLC_POPSAVEAS)); m_resolveListCtrl.SetConfirmButton((CButton*)GetDlgItem(IDOK)); m_resolveListCtrl.SetSelectButton(&m_SelectAll); m_resolveListCtrl.SetCancelBool(&m_bCancelled); -- 2.11.4.GIT