https://bugs.kde.org/show_bug.cgi?id=463572
michael <reeves...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|REPORTED |RESOLVED
Version Fixed In| |10.0.1
Latest Commit| |https://invent.kde.org/sdk/
| |kdiff3/commit/34d36270c926a
| |05e08391e623ecf3fae044c3a26
Resolution|--- |FIXED
--- Comment #1 from michael <reeves...@gmail.com> ---
Git commit 34d36270c926a05e08391e623ecf3fae044c3a26 by Michael Reeves.
Committed on 27/03/2023 at 16:41.
Pushed by mreeves into branch '1.10'.
Don't show confilcts dialog in auto mode when all are solved
FIXED-IN:10.0.1
(cherry picked from commit ce272265a414b05ccd87110ab24dd3610c3d15e6)
M +5 -3 src/mergeresultwindow.cpp
M +1 -1 src/mergeresultwindow.h
M +1 -1 src/pdiff.cpp
https://invent.kde.org/sdk/kdiff3/commit/34d36270c926a05e08391e623ecf3fae044c3a26
--
You are receiving this mail because:
You are watching all bug changes.
