From 3ab664caf1c12e6ac2744df0c16c181b7b7df62d Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 21 May 2015 00:38:47 +0200 Subject: [PATCH] Fix assertion Fixes a regression introduced in revision dc9f3aa95da02cb38073c32956123bdeb5f7c80a. Based on TortoiseSVN revision 26524. Signed-off-by: Sven Strickroth --- src/TortoiseMerge/BaseView.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/TortoiseMerge/BaseView.cpp b/src/TortoiseMerge/BaseView.cpp index 435a5e1a8..a87add82d 100644 --- a/src/TortoiseMerge/BaseView.cpp +++ b/src/TortoiseMerge/BaseView.cpp @@ -4559,6 +4559,16 @@ bool CBaseView::GetInlineDiffPositions(int nViewLine, std::vector size_t position = 0; while (diff) { + if (this == m_pwndRight) + { + apr_off_t nTmp = diff->modified_length; + diff->modified_length = diff->original_length; + diff->original_length = nTmp; + + nTmp = diff->modified_start; + diff->modified_start = diff->original_start; + diff->original_start = nTmp; + } apr_off_t len = diff->original_length; size_t oldpos = position; -- 2.11.4.GIT