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>
Andrew Kreimer committed
Sep 19, 2024 at 18:34 UTC
a966ad1e1b5d3c4788294262ba4bcd67f79176ea
1 file changed
+2
-2
merge-ort.c
+2
-2
@@ -1148,7 +1148,7 @@ static void collect_rename_info(struct merge_options *opt,
1148
* Update dir_rename_mask (determines ignore-rename-source validity)
1149
*
1150
* dir_rename_mask helps us keep track of when directory rename
1151
- * detection may be relevant. Basically, whenver a directory is
1151
+ * detection may be relevant. Basically, whenever a directory is
1152
* removed on one side of history, and a file is added to that
1153
* directory on the other side of history, directory rename
1154
* detection is relevant (meaning we have to detect renames for all
@@ -3836,7 +3836,7 @@ static int write_completed_directory(struct merge_options *opt,
3836
* src/moduleB 2
3837
*
3838
* which is used to know that xtract.c & token.txt are from the
3839
- * toplevel dirctory, while umm.c & stuff.h & baz.c are from the
3839
+ * toplevel directory, while umm.c & stuff.h & baz.c are from the
3840
* src/moduleB directory. Again, following the example above,
3841
* once we need to process src/moduleB, then info->offsets is
3842
* updated to