https://bugs.kde.org/show_bug.cgi?id=411472
michael <reeves...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Latest Commit| |https://invent.kde.org/kde/
| |kdiff3/commit/426aa87f7fd15
| |c4fabed446469035a651265b285
Status|CONFIRMED |RESOLVED
Resolution|--- |FIXED
Version Fixed In| |1.8.2
--- Comment #2 from michael <reeves...@gmail.com> ---
Git commit 426aa87f7fd15c4fabed446469035a651265b285 by Michael Reeves.
Committed on 27/03/2020 at 14:34.
Pushed by mreeves into branch 'master'.
Fix adding blank line.
Don't treat newly intserted lines as a conflict.
FIXED-IN:1.8.2
M +9 -2 src/MergeEditLine.h
https://invent.kde.org/kde/kdiff3/commit/426aa87f7fd15c4fabed446469035a651265b285
--
You are receiving this mail because:
You are watching all bug changes.
