From 3efc460e1191c83c6dcde29e05182ec9fc65e976 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 8 Sep 2011 22:24:06 +0200 Subject: [PATCH] Fixes issue #893. "Show Unified Diff" on file entry in "show log" has changes backwards Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/Git/GitStatusListCtrl.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index b0dedcd36..48de47cce 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -1,6 +1,7 @@ = Release 1.7.4.0 = == Bug Fix == * Fixed issue #899: Push via Showlog use Push with force option + * Fixed issue #893: "Show Unified Diff" on file entry in "show log" has changes backwards = Release 1.7.3.0 = == Features == diff --git a/src/Git/GitStatusListCtrl.cpp b/src/Git/GitStatusListCtrl.cpp index 77a7ad273..670d451a4 100644 --- a/src/Git/GitStatusListCtrl.cpp +++ b/src/Git/GitStatusListCtrl.cpp @@ -2223,8 +2223,8 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point) else { if((filepath->m_ParentNo&(PARENT_MASK|MERGE_MASK)) ==0) - CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,m_CurrentVersion, - *filepath,m_CurrentVersion+_T("~1")); + CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,m_CurrentVersion+_T("~1"), + *filepath,m_CurrentVersion); else { CString str; -- 2.11.4.GIT