From ee8edb7156bdb2b13420d59b66bb51edb88cbe83 Mon Sep 17 00:00:00 2001 From: "D. Ben Knoble" Date: Mon, 24 Mar 2025 16:52:23 -0400 Subject: 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 --- Documentation/mergetools/vimdiff.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. .... ------------------------------------------ -- cgit v1.2.3