https://bugs.kde.org/show_bug.cgi?id=437570
michael <reeves...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Latest Commit|https://invent.kde.org/sdk/ |https://invent.kde.org/sdk/
|kdiff3/commit/cb1801979c87a |kdiff3/commit/17b02147d5e9d
|36e2b0d38f8c1d5780b95cf7d60 |14a518dd4c5c9b63ef330e1c539
--- Comment #9 from michael <reeves...@gmail.com> ---
Git commit 17b02147d5e9d14a518dd4c5c9b63ef330e1c539 by Michael Reeves, on
behalf of Adriaan de Groot.
Committed on 24/06/2021 at 20:08.
Pushed by mreeves into branch '1.9'.
Do not put line feed between removed lines
If a line is removed in a merge, then there should be no
line feed before it -- that will come from a subsequent
**non**-deleted line. This avoids double-newlines when a
line is removed.
(cherry picked from commit 942325c58a922b0297861ad3c2b1832248b1bf14)
FIXED-IN:1.9.3
(cherry picked from commit cb1801979c87a36e2b0d38f8c1d5780b95cf7d60)
M +4 -1 src/mergeresultwindow.cpp
https://invent.kde.org/sdk/kdiff3/commit/17b02147d5e9d14a518dd4c5c9b63ef330e1c539
--
You are receiving this mail because:
You are watching all bug changes.
