diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-04-08 11:43:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-08 11:43:16 -0700 |
| commit | 19153a886bfb71186efcfa0cf33524a9bf18e623 (patch) | |
| tree | 538b67cfb1bd1308d047bf9fec957c0ab0a6ba3f | |
| parent | Merge branch 'fr/vimdiff-layout-fixes' (diff) | |
| parent | vimdiff: clarify the sigil used for marking the buffer to save (diff) | |
| download | git-19153a886bfb71186efcfa0cf33524a9bf18e623.tar.gz git-19153a886bfb71186efcfa0cf33524a9bf18e623.zip | |
Merge branch 'dk/vimdiff-doc-fix'
Doc update.
* dk/vimdiff-doc-fix:
vimdiff: clarify the sigil used for marking the buffer to save
| -rw-r--r-- | Documentation/mergetools/vimdiff.adoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/mergetools/vimdiff.adoc b/Documentation/mergetools/vimdiff.adoc index befa86d692..ab915df408 100644 --- 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. .... ------------------------------------------ |