This is an automated email from the ASF dual-hosted git repository. lhotari pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/pulsar-site.git
The following commit(s) were added to refs/heads/main by this push: new f6e167e42868 Add note about kdiff3 1.11.1 bug f6e167e42868 is described below commit f6e167e42868b62a5849ea051211dc831dd9c179 Author: Lari Hotari <lhot...@users.noreply.github.com> AuthorDate: Tue Jun 4 17:24:24 2024 +0300 Add note about kdiff3 1.11.1 bug --- contribute/setup-mergetool.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contribute/setup-mergetool.md b/contribute/setup-mergetool.md index e7dada5a0d34..cf7b425f3a02 100644 --- a/contribute/setup-mergetool.md +++ b/contribute/setup-mergetool.md @@ -33,6 +33,9 @@ git config --global difftool.kdiff3.trustExitCode false git config --global diff.guitool kdiff3 ``` +`kdiff3` version 1.11.1 contains [bug #487338](https://bugs.kde.org/show_bug.cgi?id=487338). You might want to install kdiff3 1.10.7 from https://download.kde.org/stable/kdiff3/ until the issue is resolved. + + ### kdiff3 configuration on Linux Install `kdiff3` from your package manager. For example, on Ubuntu: