mergetool--lib: add p4merge as a pre-configured mergetool option

diff --git a/Documentation/git.txt b/Documentation/git.txt
index df46a3437197612a03d9d3f16c4fedf00af3cd16..0f536793dfc1929f661029b61a1057d2b7a95abc 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.6.5/git.html[documentation for release 1.6.5]
+* link:v1.6.5.2/git.html[documentation for release 1.6.5.2]
 
 * release notes for
+  link:RelNotes-1.6.5.2.txt[1.6.5.2],
   link:RelNotes-1.6.5.1.txt[1.6.5.1],
   link:RelNotes-1.6.5.txt[1.6.5].