Merge branch 'jl/submodule-update-retire-orig-flags'

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 858bc37e80de90b8a15887759c612e2a9704f91a..a280f498179eb2747b32ba5de4111ccb32024848 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -264,7 +264,7 @@ list_merge_tool_candidates () {
 }
 
 show_tool_help () {
-       tool_opt="'git ${TOOL_MODE}tool --tool-<tool>'"
+       tool_opt="'git ${TOOL_MODE}tool --tool=<tool>'"
 
        tab='   '
        LF='