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

diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 59321a2e82b1e141746d94c439452b52b84994ad..7df3cef46f3cc2a0cb0e0d7197b431b01b3af4fd 100644 (file)
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -31,8 +31,8 @@ precedence, the last matching pattern decides the outcome):
 
  * Patterns read from a `.gitignore` file in the same directory
    as the path, or in any parent directory, with patterns in the
-   higher level files (up to the root) being overridden by those in
-   lower level files down to the directory containing the file.
+   higher level files (up to the toplevel of the work tree) being overridden
+   by those in lower level files down to the directory containing the file.
    These patterns match relative to the location of the
    `.gitignore` file.  A project normally includes such
    `.gitignore` files in its repository, containing patterns for