{"thread":{"id":"63187","subject":"[PATCH v2] vimdiff: clarify the sigil used for marking the buffer to save","startedAt":"2025-03-24T20:53:32Z","lastAt":"2025-03-24T22:48:07Z","messageCount":2,"participants":["D. Ben Knoble","Fernando Ramos"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"514973","messageId":"20250324205327.79627-1-ben.knoble+github@gmail.com","threadId":"63187","inReplyTo":null,"subject":"[PATCH v2] 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:52:23Z","receivedAt":"2025-03-24T20:53:32Z","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\nSigned-off-by: D. Ben Knoble <ben.knoble+github@gmail.com>\n---\n\n- v2 signs off the patch ;)\n- v1 with notes on the name arobase and scope of change: https://lore.kernel.org/git/CAPig+cQg_VTN7Ug3FTdLdkVwSPZGiQHJZSpCkA2pTxwBiT29bw@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\nDiff-intervalle contre v1 :\n1:  5b8b824e61 ! 1:  4ab274c3c4 vimdiff: clarify the sigil used for marking the buffer to save\n    @@ Commit message\n         asterisk, which is the character \"*\". The code and examples have always\n         looked for an arobase (\"@\").\n     \n    +    Signed-off-by: D. Ben Knoble <ben.knoble+github@gmail.com>\n    +\n      ## Documentation/mergetools/vimdiff.adoc ##\n     @@ Documentation/mergetools/vimdiff.adoc: command.\n      +\n-- \n2.48.1\n\n"},{"id":"514975","messageId":"Z-Hg8AznMSSuZpvb@x395.localdomain","threadId":"63187","inReplyTo":"20250324205327.79627-1-ben.knoble+github@gmail.com","subject":"Re: [PATCH v2] vimdiff: clarify the sigil used for marking the buffer to save","fromName":"Fernando Ramos","fromEmail":"greenfoo@u92.eu","sentAt":"2025-03-24T22:47:12Z","receivedAt":"2025-03-24T22:48:07Z","isPatch":true,"sender":{"key":"greenfoo@u92.eu","avatar":"https://avatars.githubusercontent.com/u/42691086?v=4"},"body":"Good catch!\n\nIf I recall correctly, the very first version of the code used an asterisk\ninstead of the \"@\" symbol... but it looks like I forgot to update that part of\nthe documentation once the asterisk option was discarded.\n\nThanks!\n"}]}