difftool: handle unmerged files in dir-diff mode

diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt
index f60ee051f8c0e930e790add0bd1be39f49c82785..e94367a5ed8e8b94bca7036ff7616bc3cfa9ca97 100644 (file)
--- a/Documentation/git-check-ignore.txt
+++ b/Documentation/git-check-ignore.txt
@@ -114,7 +114,6 @@ SEE ALSO
 linkgit:gitignore[5]
 linkgit:gitconfig[5]
 linkgit:git-ls-files[1]
-GIT_TRACE_EXCLUDE in linkgit:git[1]
 
 GIT
 ---