From: Stefan Saasen <ssaasen@atlassian.com>
Date: Fri, 4 Oct 2013 14:34:53 +0000 (-0700)
Subject: mergetool--lib: Fix typo in the merge/difftool help
X-Git-Tag: rs/ref-transaction-1~598
X-Git-Url: https://repo.or.cz/w/git/jrn.git/commitdiff_plain/2b7ca916fcffafe9cfd967cce87436a9372ae969

mergetool--lib: Fix typo in the merge/difftool help

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>
---

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 858bc37e80..a280f49817 100644
--- 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='