Fix earlier mismerges.

diff --git a/Documentation/tutorial-2.txt b/Documentation/tutorial-2.txt
index 9c9500c1f1f618eeac284f679a5bc1efd8a1b7b7..82c692254e36e7aff597407633baeb2b5ee91a05 100644 (file)
--- a/Documentation/tutorial-2.txt
+++ b/Documentation/tutorial-2.txt
@@ -49,7 +49,7 @@ tree
 
 A tree can refer to one or more "blob" objects, each corresponding to
 a file.  In addition, a tree can also refer to other tree objects,
-thus creating a directory heirarchy.  You can examine the contents of
+thus creating a directory hierarchy.  You can examine the contents of
 any tree using ls-tree (remember that a long enough initial portion
 of the SHA1 will also work):