aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/mergetools
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2023-10-08 06:45:14 +0000
committerJunio C Hamano <gitster@pobox.com>2023-10-09 12:06:29 -0700
commit6cc668c0abd65415a461c6dddfefffaaeb1d5adc (patch)
tree3c50d80fbb4209594f0779be95899d7ba251cb82 /Documentation/mergetools
parent401a4e257e6be731f7dd230b399800a1d79415d0 (diff)
downloadgit-6cc668c0abd65415a461c6dddfefffaaeb1d5adc.tar.gz
documentation: fix singular vs. plural
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.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/mergetools/vimdiff.txt b/Documentation/mergetools/vimdiff.txt
index c36c547939..d1a4c468e6 100644
--- a/Documentation/mergetools/vimdiff.txt
+++ b/Documentation/mergetools/vimdiff.txt
@@ -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 `/`.
--