diff options
| author | D. Ben Knoble <ben.knoble+github@gmail.com> | 2025-03-24 16:52:23 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-03-25 16:14:48 -0700 |
| commit | ee8edb7156bdb2b13420d59b66bb51edb88cbe83 (patch) | |
| tree | b08e453b0bc26d0ba83f9b36e07fa50b00b72939 | |
| parent | 2f323bb16219c105e0c576ea4c2ece9863f5d926 (diff) | |
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 <ben.knoble+github@gmail.com>
Acked-by: Fernando Ramos <greenfoo@u92.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/mergetools/vimdiff.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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. .... ------------------------------------------ |