diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:04:21 -0700 |
| commit | cf6cac20059123d6ec3f867bb3692df62db52cf9 (patch) | |
| tree | 99e0ee363183782b239257d69d28282c44100136 /Documentation/mergetools | |
| parent | 3a06386e314565108ad56a9bdb8f7b80ac52fb69 (diff) | |
| download | git-cf6cac20059123d6ec3f867bb3692df62db52cf9.tar.gz | |
documentation: wording improvements
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/mergetools')
| -rw-r--r-- | Documentation/mergetools/vimdiff.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/mergetools/vimdiff.txt b/Documentation/mergetools/vimdiff.txt index 2d631e9b1f..c36c547939 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): `@` > `+` > `/` > `,` |