{"thread":{"id":"63186","subject":"[PATCH] vimdiff: clarify the sigil used for marking the buffer to save","startedAt":"2025-03-24T20:46:09Z","lastAt":"2025-03-24T20:51:29Z","messageCount":3,"participants":["D. Ben Knoble","Eric Sunshine"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"514970","messageId":"20250324204558.76145-1-ben.knoble+github@gmail.com","threadId":"63186","inReplyTo":null,"subject":"[PATCH] vimdiff: clarify the sigil used for marking the buffer to save","fromName":"D. Ben Knoble","fromEmail":"ben.knoble+github@gmail.com","sentAt":"2025-03-24T20:45:55Z","receivedAt":"2025-03-24T20:46:09Z","isPatch":true,"sender":{"key":"ben.knoble@gmail.com","avatar":"https://avatars.githubusercontent.com/u/22802209?v=4"},"body":"The original documentation from 7b5cf8be18 (vimdiff: add tool\ndocumentation, 2022-03-30) mistakenly described the marker as an\nasterisk, which is the character \"*\". The code and examples have always\nlooked for an arobase (\"@\").\n---\n\nNB The (French) name arobase for \"@\" is gaining popularity in English writing\nbut is not yet universally standard. Use of a different name when picking is\nfine by me.\n\nI also did not attempt to clarify the behavior from the recent bug report [1]\nbecause I hope it is repared rather than documented.\n\n[1]: https://lore.kernel.org/git/CAC6paJg19ue7W0VxTnGH-1ra3Zkk+pRnj6McEC755RD54xDzCA@mail.gmail.com/\n\n Documentation/mergetools/vimdiff.adoc | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/mergetools/vimdiff.adoc b/Documentation/mergetools/vimdiff.adoc\nindex befa86d692..ab915df408 100644\n--- a/Documentation/mergetools/vimdiff.adoc\n+++ b/Documentation/mergetools/vimdiff.adoc\n@@ -86,7 +86,7 @@ command.\n +\n --\n When `MERGED` is not present in the layout, you must \"mark\" one of the\n-buffers with an asterisk. That will become the buffer you need to edit and\n+buffers with an arobase (`@`). That will become the buffer you need to edit and\n save after resolving the conflicts.\n ....\n ------------------------------------------\n-- \n2.48.1\n\n"},{"id":"514971","messageId":"CAPig+cQg_VTN7Ug3FTdLdkVwSPZGiQHJZSpCkA2pTxwBiT29bw@mail.gmail.com","threadId":"63186","inReplyTo":"20250324204558.76145-1-ben.knoble+github@gmail.com","subject":"Re: [PATCH] vimdiff: clarify the sigil used for marking the buffer to save","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2025-03-24T20:47:22Z","receivedAt":"2025-03-24T20:47:34Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Mon, Mar 24, 2025 at 4:46 PM D. Ben Knoble\n<ben.knoble+github@gmail.com> wrote:\n> The original documentation from 7b5cf8be18 (vimdiff: add tool\n> documentation, 2022-03-30) mistakenly described the marker as an\n> asterisk, which is the character \"*\". The code and examples have always\n> looked for an arobase (\"@\").\n> ---\n\nMissing sign-off.\n"},{"id":"514972","messageId":"CALnO6CAcue+fnm8-CYobdraoieXA1Mzh8yb8V4e7N6w73+_ZEA@mail.gmail.com","threadId":"63186","inReplyTo":"CAPig+cQg_VTN7Ug3FTdLdkVwSPZGiQHJZSpCkA2pTxwBiT29bw@mail.gmail.com","subject":"Re: [PATCH] vimdiff: clarify the sigil used for marking the buffer to save","fromName":"D. Ben Knoble","fromEmail":"ben.knoble+github@gmail.com","sentAt":"2025-03-24T20:51:14Z","receivedAt":"2025-03-24T20:51:29Z","isPatch":true,"sender":{"key":"ben.knoble@gmail.com","avatar":"https://avatars.githubusercontent.com/u/22802209?v=4"},"body":"On Mon, Mar 24, 2025 at 4:47 PM Eric Sunshine <sunshine@sunshineco.com> wrote:\n>\n> On Mon, Mar 24, 2025 at 4:46 PM D. Ben Knoble\n> <ben.knoble+github@gmail.com> wrote:\n> > The original documentation from 7b5cf8be18 (vimdiff: add tool\n> > documentation, 2022-03-30) mistakenly described the marker as an\n> > asterisk, which is the character \"*\". The code and examples have always\n> > looked for an arobase (\"@\").\n> > ---\n>\n> Missing sign-off.\n\ndoh, indeed.\n"}]}