diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-22 16:57:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-22 16:57:12 -0800 |
| commit | a70c988a0584e1197ffd19b26c28e9790da32363 (patch) | |
| tree | eb0f2dd1584011f40e4589c81288ac3b9f3d7c61 /git-mergetool--lib.html | |
| parent | b4fc8e8cbb4fa1443a8546bdff0b1e5cd06f15fd (diff) | |
| download | git-htmldocs-a70c988a0584e1197ffd19b26c28e9790da32363.tar.gz | |
Autogenerated HTML docs for v2.30.1-602-g966e6
Diffstat (limited to 'git-mergetool--lib.html')
| -rw-r--r-- | git-mergetool--lib.html | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/git-mergetool--lib.html b/git-mergetool--lib.html index b23438380..258a1aac3 100644 --- a/git-mergetool--lib.html +++ b/git-mergetool--lib.html @@ -799,6 +799,15 @@ get_merge_tool_path </p>
</dd>
<dt class="hdlist1">
+initialize_merge_tool
+</dt>
+<dd>
+<p>
+ bring merge tool specific functions into scope so they can be used or
+ overridden.
+</p>
+</dd>
+<dt class="hdlist1">
run_merge_tool
</dt>
<dd>
@@ -823,7 +832,7 @@ run_merge_tool <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 08:03:13 PDT
+ 2021-02-22 16:54:23 PST
</div>
</div>
</body>
|