From 8c3299d4a5410dc23c828c0ee85abc06f40f23f4 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 12 Feb 2017 17:56:43 +0100 Subject: [PATCH] SyncDlg: Enable more options for conflict view Signed-off-by: Sven Strickroth (cherry picked from commit 7d83bff3c1501512784942b814544f78c57bfa11) --- src/TortoiseProc/SyncDlg.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp index 4767fa0e0..d443eb447 100644 --- a/src/TortoiseProc/SyncDlg.cpp +++ b/src/TortoiseProc/SyncDlg.cpp @@ -939,8 +939,7 @@ BOOL CSyncDlg::OnInitDialog() m_ctrlTabCtrl.InsertTab(&m_ConflictFileList, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_CONFLICTS)), -1); m_ConflictFileList.Init(GITSLC_COLEXT | GITSLC_COLSTATUS |GITSLC_COLADD|GITSLC_COLDEL, L"ConflictSyncDlg", - (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_COMPARETWOREVISIONS) | - CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_GNUDIFF2REVISIONS) | + (GITSLC_POPEXPLORE | GITSLC_POPOPEN | GITSLC_POPSHOWLOG | GITSLC_POPCONFLICT|GITSLC_POPRESOLVE),false); -- 2.11.4.GIT