Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
mergetool--lib: Fix typo in the merge/difftool help
author
Stefan Saasen
<ssaasen@atlassian.com>
Fri, 4 Oct 2013 14:34:53 +0000
(07:34 -0700)
committer
Jonathan Nieder
<jrnieder@gmail.com>
Mon, 14 Oct 2013 23:28:38 +0000
(16:28 -0700)
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>
git-mergetool--lib.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
9371322
)
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='