summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Saasen <ssaasen@atlassian.com>2013-10-04 14:34:53 (GMT)
committerJonathan Nieder <jrnieder@gmail.com>2013-10-14 23:28:38 (GMT)
commit2b7ca916fcffafe9cfd967cce87436a9372ae969 (patch)
treee3790f5da454a4ddc0998e762aafbfdd09d04423
parent9371322a60932ca91ed8e27f88eb7af92df29716 (diff)
downloadgit-2b7ca916fcffafe9cfd967cce87436a9372ae969.zip
git-2b7ca916fcffafe9cfd967cce87436a9372ae969.tar.gz
git-2b7ca916fcffafe9cfd967cce87436a9372ae969.tar.bz2
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>
-rw-r--r--git-mergetool--lib.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 858bc37..a280f49 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='