diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-17 21:55:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-17 21:55:35 -0700 |
| commit | 4304bf6b4ee4210f0aee438088114a7761d2d667 (patch) | |
| tree | 7d2620971a1ac9f05d6b6ff6a1d51755287f8a4d /git-mergetool.txt | |
| parent | 3a9663e144bda415dcecea9f62d6da4e5affe0de (diff) | |
| download | git-htmldocs-4304bf6b4ee4210f0aee438088114a7761d2d667.tar.gz | |
Autogenerated HTML docs for v2.40.0-352-g667fc
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index c44e20562..07535f657 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -85,12 +85,13 @@ success of the resolution after the custom tool has exited. the default merge tool will be read from the configured `merge.guitool` variable instead of `merge.tool`. If `merge.guitool` is not set, we will fallback to the tool - configured under `merge.tool`. + configured under `merge.tool`. This may be autoselected using + the configuration variable `mergetool.guiDefault`. --no-gui:: - This overrides a previous `-g` or `--gui` setting and reads the - default merge tool will be read from the configured `merge.tool` - variable. + This overrides a previous `-g` or `--gui` setting or + `mergetool.guiDefault` configuration and reads the default merge + tool from the configured `merge.tool` variable. -O<orderfile>:: Process files in the order specified in the |