Skip to content

Commit

Permalink
mergetool--lib: Fix typo in the merge/difftool help
Browse files Browse the repository at this point in the history
The help text for the `tool` flag should mention:

    --tool=<tool>

instead of:

    --tool-<tool>

Signed-off-by: Stefan Saasen <ssaasen@atlassian.com>
Reviewed-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
  • Loading branch information
Stefan Saasen authored and Jonathan Nieder committed Oct 14, 2013
1 parent 9371322 commit 2b7ca91
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-mergetool--lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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='
Expand Down

0 comments on commit 2b7ca91

Please sign in to comment.