Merge branch 'dk/vimdiff-doc-fix'

gitster · gitster · commit 19153a886bfb · 2025-04-08T11:43:16.000-07:00
Doc update.

* dk/vimdiff-doc-fix:
  vimdiff: clarify the sigil used for marking the buffer to save
diff --git a/Documentation/mergetools/vimdiff.adoc b/Documentation/mergetools/vimdiff.adoc
@@ -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`	`------------------------------------------`