vimdiff: clarify the sigil used for marking the buffer to save

benknoble · gitster · commit ee8edb7156bd · 2025-03-25T16:14:48.000-07:00
The original documentation from 7b5cf8b (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 <ben.knoble+github@gmail.com> Acked-by: Fernando Ramos <greenfoo@u92.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git 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.
 ....
 ------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ command.`
`86`	`86`	`+`
`87`	`87`	`--`
`88`	`88`	When `MERGED` is not present in the layout, you must "mark" one of the
`89`		`-buffers with an asterisk. That will become the buffer you need to edit and`
	`89`	+buffers with an arobase (`@`). That will become the buffer you need to edit and
`90`	`90`	`save after resolving the conflicts.`
`91`	`91`	`....`
`92`	`92`	`------------------------------------------`