https://bugs.kde.org/show_bug.cgi?id=411472
michael <reeves...@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Latest Commit|https://invent.kde.org/kde/ |https://invent.kde.org/kde/ |kdiff3/commit/426aa87f7fd15 |kdiff3/commit/60e142bd99e0d |c4fabed446469035a651265b285 |b0b2d5a6f2ba7732f2432d85fdc --- Comment #3 from michael <reeves...@gmail.com> --- Git commit 60e142bd99e0db0b2d5a6f2ba7732f2432d85fdc by Michael Reeves. Committed on 27/03/2020 at 05:01. Pushed by mreeves into branch '1.8'. Fix adding a blank line. Don't treat newly intserted lines as a conflict. FIXED-IN:1.8.2 M +9 -7 src/mergeresultwindow.h https://invent.kde.org/kde/kdiff3/commit/60e142bd99e0db0b2d5a6f2ba7732f2432d85fdc -- You are receiving this mail because: You are watching all bug changes.