From daa204724d781140faf3c57e3c6e2524fc532226 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 11 Feb 2011 22:31:26 +0100 Subject: [PATCH] improve displayed error message Signed-off-by: Sven Strickroth --- src/TortoiseProc/GitLogListAction.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/TortoiseProc/GitLogListAction.cpp b/src/TortoiseProc/GitLogListAction.cpp index 775e67e8d..42fd3b05e 100644 --- a/src/TortoiseProc/GitLogListAction.cpp +++ b/src/TortoiseProc/GitLogListAction.cpp @@ -393,15 +393,12 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect, CMe head.Format(_T("HEAD~%d"),LastSelect-headindex); hashLast=g_Git.GetHash(head); } - + GitRev* pFirstEntry = reinterpret_cast(m_arShownList.GetAt(FirstSelect)); GitRev* pLastEntry = reinterpret_cast(m_arShownList.GetAt(LastSelect)); if(pFirstEntry->m_CommitHash != hashFirst || pLastEntry->m_CommitHash != hashLast) { - CMessageBox::Show(NULL,_T( - "Cannot combine commits now.\r\n\ - Make sure you are viewing the log of your current branch and \ - no filters are applied."),_T("TortoiseGit"),MB_OK); + CMessageBox::Show(NULL,_T("Cannot combine commits now.\r\nMake sure you are viewing the log of your current branch and no filters are applied."),_T("TortoiseGit"),MB_OK); break; } -- 2.11.4.GIT