https://bugs.kde.org/show_bug.cgi?id=437570
michael <reeves...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Version Fixed In| |1.9.3
Status|CONFIRMED |RESOLVED
Resolution|--- |FIXED
Latest Commit| |https://invent.kde.org/sdk/
| |kdiff3/commit/cb1801979c87a
| |36e2b0d38f8c1d5780b95cf7d60
--- Comment #7 from michael <reeves...@gmail.com> ---
Git commit cb1801979c87a36e2b0d38f8c1d5780b95cf7d60 by Michael Reeves, on
behalf of Adriaan de Groot.
Committed on 24/06/2021 at 19:47.
Pushed by mreeves into branch 'master'.
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
M +4 -1 src/mergeresultwindow.cpp
https://invent.kde.org/sdk/kdiff3/commit/cb1801979c87a36e2b0d38f8c1d5780b95cf7d60
--
You are receiving this mail because:
You are watching all bug changes.
