diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-23 13:56:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-23 13:56:37 -0700 |
| commit | d12166d3c8bb12d5a1638c870fc590c4e300a413 (patch) | |
| tree | e7966e82f4d5bb09686cea32472b7075e3130ce5 /Documentation/mergetools/vimdiff.txt | |
| parent | 5edbcead426056b54286499149244ae4cbf8b5f7 (diff) | |
| parent | 5fbcdb2082ab5e154133048547c8f60c418b875c (diff) | |
| download | git-d12166d3c8bb12d5a1638c870fc590c4e300a413.tar.xz | |
Merge branch 'en/docfixes'
Documentation typo and grammo fixes.
* en/docfixes: (25 commits)
documentation: add missing parenthesis
documentation: add missing quotes
documentation: add missing fullstops
documentation: add some commas where they are helpful
documentation: fix whitespace issues
documentation: fix capitalization
documentation: fix punctuation
documentation: use clearer prepositions
documentation: add missing hyphens
documentation: remove unnecessary hyphens
documentation: add missing article
documentation: fix choice of article
documentation: whitespace is already generally plural
documentation: fix singular vs. plural
documentation: fix verb vs. noun
documentation: fix adjective vs. noun
documentation: fix verb tense
documentation: employ consistent verb tense for a list
documentation: fix subject/verb agreement
documentation: remove extraneous words
...
Diffstat (limited to 'Documentation/mergetools/vimdiff.txt')
| -rw-r--r-- | Documentation/mergetools/vimdiff.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/mergetools/vimdiff.txt b/Documentation/mergetools/vimdiff.txt index 2d631e9b1f..d1a4c468e6 100644 --- a/Documentation/mergetools/vimdiff.txt +++ b/Documentation/mergetools/vimdiff.txt @@ -32,10 +32,10 @@ have special meaning: - `+` is used to "open a new tab" - `,` is used to "open a new vertical split" - `/` is used to "open a new horizontal split" - - `@` is used to indicate which is the file containing the final version after + - `@` is used to indicate the file containing the final version after solving the conflicts. If not present, `MERGED` will be used by default. -The precedence of the operators is this one (you can use parentheses to change +The precedence of the operators is as follows (you can use parentheses to change it): `@` > `+` > `/` > `,` @@ -162,7 +162,7 @@ information as the first tab, with a different layout. | REMOTE | | --------------------------------------------- .... -Note how in the third tab definition we need to use parenthesis to make `,` +Note how in the third tab definition we need to use parentheses to make `,` have precedence over `/`. -- |