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

diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index f6037c4f6a7c6988a9a497455e555979d44e2600..2e78da448f30ad260cb7683a5610f424d0c5ffea 100644 (file)
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -412,6 +412,13 @@ turn `core.sparseCheckout` on in order to have sparse checkout
 support.
 
 
+BUGS
+----
+In order to match a directory with $GIT_DIR/info/sparse-checkout,
+trailing slash must be used. The form without trailing slash, while
+works with .gitignore, does not work with sparse checkout.
+
+
 SEE ALSO
 --------
 linkgit:git-write-tree[1]; linkgit:git-ls-files[1];