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--lib.html | |
| parent | 792b6092433e1d94ae2e4b9e83a333bf2d0425a2 (diff) | |
| download | git-htmldocs-56d696ee5be4d6ce871726df6e396c76eedcccf0.tar.gz | |
Autogenerated HTML docs for v2.22.0-rc1
Diffstat (limited to 'git-mergetool--lib.html')
| -rw-r--r-- | git-mergetool--lib.html | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-mergetool--lib.html b/git-mergetool--lib.html index 8542d5788..000542af2 100644 --- a/git-mergetool--lib.html +++ b/git-mergetool--lib.html @@ -777,7 +777,9 @@ get_merge_tool </dt>
<dd>
<p>
- returns a merge tool.
+ returns a merge tool. the return code is 1 if we returned a guessed
+ merge tool, else 0. <em>$GIT_MERGETOOL_GUI</em> may be set to <em>true</em> to
+ search for the appropriate guitool.
</p>
</dd>
<dt class="hdlist1">
@@ -821,7 +823,7 @@ run_merge_tool <div id="footer">
<div id="footer-text">
Last updated
- 2018-01-27 08:11:04 JST
+ 2019-05-19 17:58:26 JST
</div>
</div>
</body>
|