diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-19 18:01:19 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 18:01:19 +0900 |
| commit | 56d696ee5be4d6ce871726df6e396c76eedcccf0 (patch) | |
| tree | 5fdbf981967be28ae958f476b0b6d9b4343fd146 /git-mergetool.txt | |
| parent | 792b6092433e1d94ae2e4b9e83a333bf2d0425a2 (diff) | |
| download | git-htmldocs-56d696ee5be4d6ce871726df6e396c76eedcccf0.tar.gz | |
Autogenerated HTML docs for v2.22.0-rc1
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index 0c7975a05..6b14702e7 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -83,7 +83,9 @@ success of the resolution after the custom tool has exited. --gui:: When 'git-mergetool' is invoked with the `-g` or `--gui` option the default merge tool will be read from the configured - `merge.guitool` variable instead of `merge.tool`. + `merge.guitool` variable instead of `merge.tool`. If + `merge.guitool` is not set, we will fallback to the tool + configured under `merge.tool`. --no-gui:: This overrides a previous `-g` or `--gui` setting and reads the |