From: D. Ben Knoble Date: Mon, 24 Mar 2025 20:52:23 +0000 (-0400) Subject: vimdiff: clarify the sigil used for marking the buffer to save X-Git-Tag: v2.50.0-rc0~130^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee8edb7156bdb2b13420d59b66bb51edb88cbe83;p=thirdparty%2Fgit.git vimdiff: clarify the sigil used for marking the buffer to save The original documentation from 7b5cf8be18 (vimdiff: add tool documentation, 2022-03-30) mistakenly described the marker as an asterisk, which is the character "*". The code and examples have always looked for an arobase ("@"). Signed-off-by: D. Ben Knoble Acked-by: Fernando Ramos Signed-off-by: Junio C Hamano --- diff --git a/Documentation/mergetools/vimdiff.txt b/Documentation/mergetools/vimdiff.txt index d1a4c468e6..1a60aec54d 100644 --- a/Documentation/mergetools/vimdiff.txt +++ b/Documentation/mergetools/vimdiff.txt @@ -86,7 +86,7 @@ command. + -- When `MERGED` is not present in the layout, you must "mark" one of the -buffers with an asterisk. That will become the buffer you need to edit and +buffers with an arobase (`@`). That will become the buffer you need to edit and save after resolving the conflicts. .... ------------------------------------------