https://bugs.kde.org/show_bug.cgi?id=457766
michael <reeves...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Version Fixed In| |1.10.0
Resolution|--- |FIXED
Latest Commit| |https://invent.kde.org/sdk/
| |kdiff3/commit/0dd54bde01b7b
| |9c966109a45eee9bfa5ce9d89b0
Status|CONFIRMED |RESOLVED
--- Comment #2 from michael <reeves...@gmail.com> ---
Git commit 0dd54bde01b7b9c966109a45eee9bfa5ce9d89b0 by Michael Reeves.
Committed on 21/09/2022 at 18:39.
Pushed by mreeves into branch '1.10'.
Ignore manually editted blocks when resolving unresolved conflicts
FIXED-IN:1.10.0
M +1 -1 src/MergeEditLine.cpp
M +4 -0 src/MergeEditLine.h
https://invent.kde.org/sdk/kdiff3/commit/0dd54bde01b7b9c966109a45eee9bfa5ce9d89b0
--
You are receiving this mail because:
You are watching all bug changes.
