[kdiff3] [Bug 411472] kdiff3 cannot insert a blank line in 3way merge
https://bugs.kde.org/show_bug.cgi?id=411472 michael 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 --- 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-7src/mergeresultwindow.h https://invent.kde.org/kde/kdiff3/commit/60e142bd99e0db0b2d5a6f2ba7732f2432d85fdc -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 411472] kdiff3 cannot insert a blank line in 3way merge
https://bugs.kde.org/show_bug.cgi?id=411472 michael 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 --- 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-2src/MergeEditLine.h https://invent.kde.org/kde/kdiff3/commit/426aa87f7fd15c4fabed446469035a651265b285 -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 411472] kdiff3 cannot insert a blank line in 3way merge
https://bugs.kde.org/show_bug.cgi?id=411472 Jerôme Pouiller changed: What|Removed |Added CC||jerome.pouil...@gmail.com -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 411472] kdiff3 cannot insert a blank line in 3way merge
https://bugs.kde.org/show_bug.cgi?id=411472 michael changed: What|Removed |Added Ever confirmed|0 |1 Status|REPORTED|CONFIRMED -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 411472] kdiff3 cannot insert a blank line in 3way merge
https://bugs.kde.org/show_bug.cgi?id=411472 michael changed: What|Removed |Added Attachment #122437|0 |1 is obsolete|| -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 411472] kdiff3 cannot insert a blank line in 3way merge
https://bugs.kde.org/show_bug.cgi?id=411472 --- Comment #1 from michael --- This indeed does happen on two ways as well. -- You are receiving this mail because: You are watching all bug changes.
