mergetool-lib: make the three-way diff the default for vim/gvim

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 66e570113a077d2c52c4fc3ac09d24a272df5301..f88e9977d1137da0449736f5f8fe6746b42437e1 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -187,7 +187,7 @@ As a special case, the `"@\{-N\}"` syntax for the N-th last branch
 checks out the branch (instead of detaching).  You may also specify
 `-` which is synonymous with `"@\{-1\}"`.
 +
-As a further special case, you may use `"A...B"` as a shortcut for the
+As a further special case, you may use `"A\...B"` as a shortcut for the
 merge base of `A` and `B` if there is exactly one merge base. You can
 leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.