{"thread":{"id":"35066","subject":"[PATCH] mergetool--lib: Fix typo in the merge/difftool help","startedAt":"2013-10-04T14:34:53Z","lastAt":"2013-10-05T01:49:11Z","messageCount":2,"participants":["Stefan Saasen","David Aguilar"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"228562","messageId":"1380897293-41652-1-git-send-email-ssaasen@atlassian.com","threadId":"35066","inReplyTo":null,"subject":"[PATCH] mergetool--lib: Fix typo in the merge/difftool help","fromName":"Stefan Saasen","fromEmail":"ssaasen@atlassian.com","sentAt":"2013-10-04T14:34:53Z","receivedAt":"2013-10-04T14:34:53Z","isPatch":true,"sender":{"key":"ssaasen@atlassian.com","avatar":null},"body":"The help text for the `tool` flag should mention:\n\n    --tool=<tool>\n\ninstead of:\n\n    --tool-<tool>\n\nSigned-off-by: Stefan Saasen <ssaasen@atlassian.com>\n---\n git-mergetool--lib.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh\nindex feee6a4..e1c7eb1 100644\n--- a/git-mergetool--lib.sh\n+++ b/git-mergetool--lib.sh\n@@ -263,7 +263,7 @@ list_merge_tool_candidates () {\n }\n \n show_tool_help () {\n-\ttool_opt=\"'git ${TOOL_MODE}tool --tool-<tool>'\"\n+\ttool_opt=\"'git ${TOOL_MODE}tool --tool=<tool>'\"\n \n \ttab='\t'\n \tLF='\n-- \n1.8.4.474.g128a96c.dirty\n"},{"id":"228567","messageId":"CAJDDKr5wcD2sDUC-jDUmJm8coUPVSHHEK3CGJbKNZ7NoSKBA4A@mail.gmail.com","threadId":"35066","inReplyTo":"1380897293-41652-1-git-send-email-ssaasen@atlassian.com","subject":"Re: [PATCH] mergetool--lib: Fix typo in the merge/difftool help","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2013-10-05T01:49:11Z","receivedAt":"2013-10-05T01:49:11Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Fri, Oct 4, 2013 at 7:34 AM, Stefan Saasen <ssaasen@atlassian.com> wrote:\n> The help text for the `tool` flag should mention:\n>\n>     --tool=<tool>\n>\n> instead of:\n>\n>     --tool-<tool>\n>\n> Signed-off-by: Stefan Saasen <ssaasen@atlassian.com>\n> ---\n\nGood eyes!\n\nReviewed-by: David Aguilar <davvid@gmail.com>\n\nThanks\n\n>  git-mergetool--lib.sh | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh\n> index feee6a4..e1c7eb1 100644\n> --- a/git-mergetool--lib.sh\n> +++ b/git-mergetool--lib.sh\n> @@ -263,7 +263,7 @@ list_merge_tool_candidates () {\n>  }\n>\n>  show_tool_help () {\n> -       tool_opt=\"'git ${TOOL_MODE}tool --tool-<tool>'\"\n> +       tool_opt=\"'git ${TOOL_MODE}tool --tool=<tool>'\"\n>\n>         tab='   '\n>         LF='\n> --\n> 1.8.4.474.g128a96c.dirty\n>\n-- \nDavid\n"}]}