https://bugs.kde.org/show_bug.cgi?id=439640
michael <reeves...@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|REPORTED |RESOLVED Latest Commit| |https://invent.kde.org/sdk/ | |kdiff3/commit/7f9e5633b40c6 | |62d0524fc3965d5902a870084d8 Version Fixed In| |1.9.70 Resolution|--- |FIXED --- Comment #1 from michael <reeves...@gmail.com> --- Git commit 7f9e5633b40c662d0524fc3965d5902a870084d8 by Michael Reeves. Committed on 12/04/2022 at 18:04. Pushed by mreeves into branch 'master'. Make DirectoryMergeWindow a dockable widget Patch by Léo Flaventin Hauchecorne. Orignal MR contains a stray .gitignore change and commented code. Both removed for manual merge. FIXED-IN:1.9.70 M +0 -14 src/directorymergewindow.cpp M +28 -16 src/kdiff3.cpp M +7 -4 src/kdiff3.h M +29 -42 src/pdiff.cpp https://invent.kde.org/sdk/kdiff3/commit/7f9e5633b40c662d0524fc3965d5902a870084d8 -- You are receiving this mail because: You are watching all bug changes.