From 91c749dc716b7a22c057fcf57bf46a1a01fe61d9 Mon Sep 17 00:00:00 2001 From: Laurent Ganier Date: Sat, 5 Jul 2003 09:09:54 +0000 Subject: [PATCH] [ 765926 ] Merge empty last line to the last diffrange (change) --- Src/MergeDoc.cpp | 8 ++++++++ Src/readme.txt | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp index b937c71eb..38d5c03f9 100644 --- a/Src/MergeDoc.cpp +++ b/Src/MergeDoc.cpp @@ -506,9 +506,17 @@ void CMergeDoc::FixLastDiffRange(BOOL left) dr = m_diffs.GetAt(count - 1); if (left) + { + if (dr.op == OP_RIGHTONLY) + dr.op = OP_DIFF; dr.end0++; + } else + { + if (dr.op == OP_LEFTONLY) + dr.op = OP_DIFF; dr.end1++; + } m_diffs.SetAt(count - 1, dr); } diff --git a/Src/readme.txt b/Src/readme.txt index 0a3d16a8e..5f668fd8c 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,3 +1,7 @@ +2003-07-05 Laoran + PATCH: [ 765926 ] Merge empty last line to the last diffrange (change) + WinMerge: MergeDoc.cpp + 2003-07-04 Laoran PATCH: [ 766038 ] stay in the viewing area during OnFirstdiff WinMerge: MergeEditView.cpp -- 2.11.0