[PATCH 09/20] merge-ort: fix typos

From

Andrew Kreimer via GitGitGadget <gitgitgadget@gmail.com>

Date

Sep 19, 2024, 18:34 UTC

Message-ID

<915f395cb9fbed3c5d3de5d31423e2145f533e6e.1726770881.git.gitgitgadget@gmail.com>

In-Reply-To

<pull.1794.git.1726770880.gitgitgadget@gmail.com>

From: Andrew Kreimer <algonell@gmail.com>

Fix typos in comments.

Signed-off-by: Andrew Kreimer <algonell@gmail.com>
---
 merge-ort.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/merge-ort.c b/merge-ort.c
index 3752c7e595d..3460d14172c 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -1147,7 +1147,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
@@ -3835,7 +3835,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

-- 
gitgitgadget