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.html | |
| parent | 792b6092433e1d94ae2e4b9e83a333bf2d0425a2 (diff) | |
| download | git-htmldocs-56d696ee5be4d6ce871726df6e396c76eedcccf0.tar.gz | |
Autogenerated HTML docs for v2.22.0-rc1
Diffstat (limited to 'git-mergetool.html')
| -rw-r--r-- | git-mergetool.html | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-mergetool.html b/git-mergetool.html index 98cc8ee7b..79bf68d79 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -854,7 +854,9 @@ success of the resolution after the custom tool has exited.</p></div> <p>
When <em>git-mergetool</em> is invoked with the <code>-g</code> or <code>--gui</code> option
the default merge tool will be read from the configured
- <code>merge.guitool</code> variable instead of <code>merge.tool</code>.
+ <code>merge.guitool</code> variable instead of <code>merge.tool</code>. If
+ <code>merge.guitool</code> is not set, we will fallback to the tool
+ configured under <code>merge.tool</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -904,7 +906,7 @@ are successfully merged.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2018-10-30 16:33:48 JST
+ 2019-05-19 17:58:26 JST
</div>
</div>
</body>
|