{"thread":{"id":"58559","subject":"[PATCH] Fix minor typo in mergetool.txt: 'overwriten' -> 'overwritten'","startedAt":"2022-10-04T00:55:31Z","lastAt":"2022-10-05T19:23:47Z","messageCount":2,"participants":["Noah Betzen via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"464108","messageId":"pull.1350.git.git.1664844924663.gitgitgadget@gmail.com","threadId":"58559","inReplyTo":null,"subject":"[PATCH] Fix minor typo in mergetool.txt: 'overwriten' -> 'overwritten'","fromName":"Noah Betzen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-10-04T00:55:24Z","receivedAt":"2022-10-04T00:55:31Z","isPatch":true,"sender":{"key":"name:Noah Betzen","avatar":null},"body":"From: Noah Betzen <noah@nezteb.net>\n\nSigned-off-by: Noah Betzen <noah@nezteb.net>\n---\n    Fix minor typo in mergetool.txt\n    \n    I only learned of mergetool.hideResolved today, and while reading the\n    docs I noticed a tiny typo, so I figured I'd fix it.\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1350%2FNezteb%2Fpatch-1-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1350/Nezteb/patch-1-v1\nPull-Request: https://github.com/git/git/pull/1350\n\n Documentation/config/mergetool.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt\nindex 90b38097002..e779a122d8a 100644\n--- a/Documentation/config/mergetool.txt\n+++ b/Documentation/config/mergetool.txt\n@@ -59,7 +59,7 @@ mergetool.hideResolved::\n \tpossible and write the 'MERGED' file containing conflict markers around\n \tany conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally\n \trepresent the versions of the file from before Git's conflict\n-\tresolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so\n+\tresolution. This flag causes 'LOCAL' and 'REMOTE' to be overwritten so\n \tthat only the unresolved conflicts are presented to the merge tool. Can\n \tbe configured per-tool via the `mergetool.<tool>.hideResolved`\n \tconfiguration variable. Defaults to `false`.\n\nbase-commit: bcd6bc478adc4951d57ec597c44b12ee74bc88fb\n-- \ngitgitgadget\n"},{"id":"464252","messageId":"xmqqh70ioz1i.fsf@gitster.g","threadId":"58559","inReplyTo":"pull.1350.git.git.1664844924663.gitgitgadget@gmail.com","subject":"Re: [PATCH] Fix minor typo in mergetool.txt: 'overwriten' -> 'overwritten'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-10-05T19:23:05Z","receivedAt":"2022-10-05T19:23:47Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Noah Betzen via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: Noah Betzen <noah@nezteb.net>\n>\n> Signed-off-by: Noah Betzen <noah@nezteb.net>\n> ---\n>     Fix minor typo in mergetool.txt\n>     \n>     I only learned of mergetool.hideResolved today, and while reading the\n>     docs I noticed a tiny typo, so I figured I'd fix it.\n\nThanks.  Will apply.\n\n>\n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1350%2FNezteb%2Fpatch-1-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1350/Nezteb/patch-1-v1\n> Pull-Request: https://github.com/git/git/pull/1350\n>\n>  Documentation/config/mergetool.txt | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt\n> index 90b38097002..e779a122d8a 100644\n> --- a/Documentation/config/mergetool.txt\n> +++ b/Documentation/config/mergetool.txt\n> @@ -59,7 +59,7 @@ mergetool.hideResolved::\n>  \tpossible and write the 'MERGED' file containing conflict markers around\n>  \tany conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally\n>  \trepresent the versions of the file from before Git's conflict\n> -\tresolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so\n> +\tresolution. This flag causes 'LOCAL' and 'REMOTE' to be overwritten so\n>  \tthat only the unresolved conflicts are presented to the merge tool. Can\n>  \tbe configured per-tool via the `mergetool.<tool>.hideResolved`\n>  \tconfiguration variable. Defaults to `false`.\n>\n> base-commit: bcd6bc478adc4951d57ec597c44b12ee74bc88fb\n"}]}