difftool: handle unmerged files in dir-diff mode

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 8afe349781d57527083fdb75511959fd25a4239b..34ff007a98156162431d5dd03abaaffe5d0c29a0 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v2.8.1/git.html[documentation for release 2.8.1]
+* link:v2.8.2/git.html[documentation for release 2.8.2]
 
 * release notes for
+  link:RelNotes/2.8.2.txt[2.8.2].
   link:RelNotes/2.8.1.txt[2.8.1].
   link:RelNotes/2.8.0.txt[2.8].