diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-30 16:34:40 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-30 16:34:40 +0900 |
| commit | 94d00a5c4ebb12f2552118f261d8f82c05c2501d (patch) | |
| tree | 89cfa22e35b5476dd4ae8ab79277fa6f2eb25557 /git-merge.html | |
| parent | a4df8edd688285dc532353d4075d979d5ec20306 (diff) | |
| download | git-htmldocs-94d00a5c4ebb12f2552118f261d8f82c05c2501d.tar.gz | |
Autogenerated HTML docs for v2.19.1-708-g4ede3
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/git-merge.html b/git-merge.html index eeb9a260c..75660d09b 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1773,6 +1773,17 @@ merge.tool Any other value is treated as a custom merge tool and requires
that a corresponding mergetool.<tool>.cmd variable is defined.
</p>
+</dd>
+<dt class="hdlist1">
+merge.guitool
+</dt>
+<dd>
+<p>
+ Controls which merge tool is used by <a href="git-mergetool.html">git-mergetool(1)</a> when the
+ -g/--gui flag is specified. The list below shows the valid built-in values.
+ Any other value is treated as a custom merge tool and requires that a
+ corresponding mergetool.<guitool>.cmd variable is defined.
+</p>
<div class="ulist"><ul>
<li>
<p>
@@ -1977,7 +1988,7 @@ branch.<name>.mergeOptions <div id="footer">
<div id="footer-text">
Last updated
- 2018-08-02 16:01:08 PDT
+ 2018-08-03 08:01:08 JST
</div>
</div>
</body>
|