(pulsar-site) branch main updated: Fix typos in setup-mergetool commands

[lhotari]

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 94015179e789 Fix typos in setup-mergetool commands
94015179e789 is described below

commit 94015179e789bc6fde042357a9dfdd55ee71794b
Author: Lari Hotari <lhot...@users.noreply.github.com>
AuthorDate: Tue Mar 5 12:50:54 2024 +0200

    Fix typos in setup-mergetool commands
---
 contribute/setup-mergetool.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contribute/setup-mergetool.md b/contribute/setup-mergetool.md
index f0f2066fefb1..b67cf1db3f46 100644
--- a/contribute/setup-mergetool.md
+++ b/contribute/setup-mergetool.md
@@ -30,7 +30,7 @@ git config --global merge.tool kdiff3
 git config --global difftool.kdiff3.path 
/Applications/kdiff3.app/Contents/MacOS/kdiff3
 git config --global difftool.kdiff3.args '$base $local $other -o $output'
 git config --global difftool.kdiff3.trustExistCode false
-git config --global diff.guitool=kdiff3
+git config --global diff.guitool kdiff3
 ```
 
 ### kdiff3 configuration on Linux
@@ -45,7 +45,7 @@ Configure `kdiff3` as the mergetool and difftool of git
 git config --global mergetool.kdiff3.path /usr/bin/kdiff3
 git config --global merge.tool kdiff3
 git config --global difftool.kdiff3.path /usr/bin/kdiff3
-git config --global diff.guitool=kdiff3
+git config --global diff.guitool kdiff3
 ```
 
 ### Using the mergetool kdiff3