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 b35652e3306d Fix another typo in the mergetool commands for macos
b35652e3306d is described below
commit b35652e3306d0244dc79206cdfa05c2c3b344262
Author: Lari Hotari <[email protected]>
AuthorDate: Tue Mar 5 13:47:10 2024 +0200
Fix another typo in the mergetool commands for macos
---
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 b67cf1db3f46..e7dada5a0d34 100644
--- a/contribute/setup-mergetool.md
+++ b/contribute/setup-mergetool.md
@@ -25,11 +25,11 @@ Configure `kdiff3` as the mergetool and difftool of git
```shell
git config --global mergetool.kdiff3.path
/Applications/kdiff3.app/Contents/MacOS/kdiff3
git config --global mergetool.kdiff3.args '$base $local $other -o $output'
-git config --global mergetool.kdiff3.trustExistCode false
+git config --global mergetool.kdiff3.trustExitCode false
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 difftool.kdiff3.trustExitCode false
git config --global diff.guitool kdiff3
```
