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.txt | |
| parent | b4fc8e8cbb4fa1443a8546bdff0b1e5cd06f15fd (diff) | |
| download | git-htmldocs-a70c988a0584e1197ffd19b26c28e9790da32363.tar.gz | |
Autogenerated HTML docs for v2.30.1-602-g966e6
Diffstat (limited to 'git-mergetool--lib.txt')
| -rw-r--r-- | git-mergetool--lib.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-mergetool--lib.txt b/git-mergetool--lib.txt index 4da9d2409..3e8f59ac0 100644 --- a/git-mergetool--lib.txt +++ b/git-mergetool--lib.txt @@ -38,6 +38,10 @@ get_merge_tool_cmd:: get_merge_tool_path:: returns the custom path for a merge tool. +initialize_merge_tool:: + bring merge tool specific functions into scope so they can be used or + overridden. + run_merge_tool:: launches a merge tool given the tool name and a true/false flag to indicate whether a merge base is present. |