Change xdl_merge to generate output even for null merges

diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 5faaaa5fedcd0d61234d3927a89d77144f2a15ad..024abb2ff10077f86a073e83f17a4902d340097c 100644 (file)
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -86,7 +86,7 @@ This hook is invoked by 'git-commit' right after preparing the
 default log message, and before the editor is started.
 
 It takes one to three parameters.  The first is the name of the file
-that the commit log message.  The second is the source of the commit
+that contains the commit log message.  The second is the source of the commit
 message, and can be: `message` (if a `-m` or `-F` option was
 given); `template` (if a `-t` option was given or the
 configuration option `commit.template` is set); `merge` (if the