diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:54 -0700 |
| commit | 33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (patch) | |
| tree | 4a681cad5c6da23a7d7f56022666fb31397026d2 /git-mergetool--lib.html | |
| parent | 359f02427091f2c0fcac4eb7651fe5d159b84a54 (diff) | |
| download | git-htmldocs-33be82183d4cd6dc645f64da1402cf9a3f4cdbf3.tar.gz | |
Autogenerated HTML docs for v2.42.0-482-g2e8e7
Diffstat (limited to 'git-mergetool--lib.html')
| -rw-r--r-- | git-mergetool--lib.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/git-mergetool--lib.html b/git-mergetool--lib.html index f69456238..6f4780f83 100644 --- a/git-mergetool--lib.html +++ b/git-mergetool--lib.html @@ -777,7 +777,7 @@ get_merge_tool </dt>
<dd>
<p>
- returns a merge tool. the return code is 1 if we returned a guessed
+ 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>
@@ -787,7 +787,7 @@ get_merge_tool_cmd </dt>
<dd>
<p>
- returns the custom command for a merge tool.
+ Returns the custom command for a merge tool.
</p>
</dd>
<dt class="hdlist1">
@@ -795,7 +795,7 @@ get_merge_tool_path </dt>
<dd>
<p>
- returns the custom path for a merge tool.
+ Returns the custom path for a merge tool.
</p>
</dd>
<dt class="hdlist1">
@@ -803,7 +803,7 @@ initialize_merge_tool </dt>
<dd>
<p>
- bring merge tool specific functions into scope so they can be used or
+ Brings merge tool specific functions into scope so they can be used or
overridden.
</p>
</dd>
@@ -812,7 +812,7 @@ run_merge_tool </dt>
<dd>
<p>
- launches a merge tool given the tool name and a true/false
+ Launches a merge tool given the tool name and a true/false
flag to indicate whether a merge base is present.
<em>$MERGED</em>, <em>$LOCAL</em>, <em>$REMOTE</em>, and <em>$BASE</em> must be defined
for use by the merge tool.
@@ -832,7 +832,7 @@ run_merge_tool <div id="footer">
<div id="footer-text">
Last updated
- 2021-02-26 23:35:19 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
|