aboutsummaryrefslogtreecommitdiff
path: root/Documentation/mergetools/vimdiff.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/mergetools/vimdiff.txt')
-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 `/`.
--