diff options
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index 8098d2dc07..821253e368 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -326,6 +326,10 @@ prompt=$(git config --bool mergetool.prompt || echo true) while test $# != 0 do case "$1" in + --tool-help=*) + TOOL_MODE=${1#--tool-help=} + show_tool_help + ;; --tool-help) show_tool_help ;; |