Merge branch 'ms/submodule-foreach-fix' into maint

diff --git a/Documentation/git-mergetool--lib.txt b/Documentation/git-mergetool--lib.txt
index 055550b2bcc805780396b83b162a328230c0a1c6..4da9d240962f24da7daa7ebde7b4f0db4634cdd8 100644 (file)
--- a/Documentation/git-mergetool--lib.txt
+++ b/Documentation/git-mergetool--lib.txt
@@ -28,7 +28,9 @@ to define the operation mode for the functions listed below.
 FUNCTIONS
 ---------
 get_merge_tool::
-       returns a merge tool.
+       returns a merge tool. the return code is 1 if we returned a guessed
+       merge tool, else 0. '$GIT_MERGETOOL_GUI' may be set to 'true' to
+       search for the appropriate guitool.
 
 get_merge_tool_cmd::
        returns the custom command for a merge tool.