merge-recursive: make the error-message generation an extern function

[git.git] / Documentation / glossary-content.txt

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 572374f7a6ff17dd40ad687a2fda24d53f7d730b..43d84d15e921435ba4629a7d8c18021d16f89223 100644 (file)
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -456,6 +456,6 @@ This commit is referred to as a "merge commit", or sometimes just a
        of 'A' is 'origin/B' sometimes we say "'A' is tracking 'origin/B'".
 
 [[def_working_tree]]working tree::
-       The tree of actual checked out files.  The working tree is
-       normally equal to the <<def_HEAD,HEAD>> plus any local changes
-       that you have made but not yet committed.
+       The tree of actual checked out files.  The working tree normally
+       contains the contents of the <<def_HEAD,HEAD>> commit's tree,
+       plus any local changes that you have made but not yet committed.