Merge branch 'ab/detox-gettext-tests'

[thirdparty/git.git] / Documentation / git-mergetool--lib.txt

diff --git a/Documentation/git-mergetool--lib.txt b/Documentation/git-mergetool--lib.txt
index 4da9d240962f24da7daa7ebde7b4f0db4634cdd8..3e8f59ac0e46abc35b88723492fa2d411b2756ca 100644 (file)
--- a/Documentation/git-mergetool--lib.txt
+++ b/Documentation/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.