merge-ort: fix typos

Fix typos in comments.

Signed-off-by: Andrew Kreimer <algonell@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-ort.c b/merge-ort.c
index e9d01ac7f7ad344ee533e64ddf926ed2c06d1558..474ba15c016adf6ece469c1d76738f0aeb8c9f9f 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -1148,7 +1148,7 @@ static void collect_rename_info(struct merge_options *opt,
         * Update dir_rename_mask (determines ignore-rename-source validity)
         *
         * dir_rename_mask helps us keep track of when directory rename
-        * detection may be relevant.  Basically, whenver a directory is
+        * detection may be relevant.  Basically, whenever a directory is
         * removed on one side of history, and a file is added to that
         * directory on the other side of history, directory rename
         * detection is relevant (meaning we have to detect renames for all
@@ -3836,7 +3836,7 @@ static int write_completed_directory(struct merge_options *opt,
         *         src/moduleB  2
         *
         *     which is used to know that xtract.c & token.txt are from the
-        *     toplevel dirctory, while umm.c & stuff.h & baz.c are from the
+        *     toplevel directory, while umm.c & stuff.h & baz.c are from the
         *     src/moduleB directory.  Again, following the example above,
         *     once we need to process src/moduleB, then info->offsets is
         *     updated to