Merge branch 'en/disable-dir-rename-in-recursive-merge'

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 8d38ae6010866a157dfdb7d52b58605d1cd2f3b6..090c888335d3292331d012a5e9074f970035d83e 100644 (file)
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -255,7 +255,7 @@ This commit is referred to as a "merge commit", or sometimes just a
 [[def_object]]object::
        The unit of storage in Git. It is uniquely identified by the
        <<def_SHA1,SHA-1>> of its contents. Consequently, an
-       object can not be changed.
+       object cannot be changed.
 
 [[def_object_database]]object database::
        Stores a set of "objects", and an individual <<def_object,object>> is