[kdiff3] [Bug 469853] git mergetool does not resolve conflicts if using kdiff3

2023-06-02 Thread bugzilla_noreply
https://bugs.kde.org/show_bug.cgi?id=469853 --- Comment #2 from kde_b...@lukas1818.de --- Can confirm that is fixed now. Have hit a merge conflict today and everything works fine again. Thanks for the fix -- You are receiving this mail because: You are watching all bug changes.

[kdiff3] [Bug 469853] git mergetool does not resolve conflicts if using kdiff3

2023-05-21 Thread michael
https://bugs.kde.org/show_bug.cgi?id=469853 michael changed: What|Removed |Added Latest Commit||c41ce64adb2680f3874abb03567 |