Documentation: describe 'union' low-level merge driver

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 2ec0c0d270edde03adff3f56531e4cee5fe05a57..d0c3aa21d2faceaca7c6423987a0e649e7c4eda8 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -105,7 +105,8 @@ OPTIONS
 
 -v::
        Similar to `-t`, but use lowercase letters for files
-       that are marked as 'always matching index'.
+       that are marked as 'assume unchanged' (see
+       gitlink:git-update-index[1]).
 
 --full-name::
        When run from a subdirectory, the command usually