I use KDiff3 as mergetool for git and I just realized that it does not jump to the first conflict position, but to some random position at startup. So it ruins the workflow completely because I always fear to miss prior conflicts within a solving flow.
This will be fixed in the next release thanks.
Git commit 475d52c74424cabe881602713a1f4946a1987132 by Michael Reeves. Committed on 18/05/2024 at 22:51. Pushed by mreeves into tag '1.11.1'. Fix bad value limiter Use std::max not std::min to limit line value range FIXED-IN:1.11.1 M +1 -1 src/Overview.cpp M +2 -2 src/difftextwindow.cpp https://invent.kde.org/sdk/kdiff3/-/commit/475d52c74424cabe881602713a1f4946a1987132
Git commit 17021d7e2479e92b23d450b48843237c0d92e785 by Michael Reeves. Committed on 18/05/2024 at 19:27. Pushed by mreeves into branch 'master'. Fix bad value limiter Use std::max not std::min to limit line value range FIXED-IN:1.11.1 M +1 -1 src/Overview.cpp M +2 -2 src/difftextwindow.cpp https://invent.kde.org/sdk/kdiff3/-/commit/17021d7e2479e92b23d450b48843237c0d92e785