mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-ort: fix typos

Browse Source 
Fix typos in comments.

Signed-off-by: Andrew Kreimer <algonell@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Andrew Kreimer
2024-09-19 18:34:29 +00:00
committed by Junio C Hamano
parent a3621abaf9
commit a966ad1e1b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
merge-ort.c
View File

@ -1148,7 +1148,7 @@ static void collect_rename_info(struct merge_options *opt,
* Update dir_rename_mask (determines ignore-rename-source validity) * Update dir_rename_mask (determines ignore-rename-source validity)
* *
* dir_rename_mask helps us keep track of when directory rename * 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 * removed on one side of history, and a file is added to that
* directory on the other side of history, directory rename * directory on the other side of history, directory rename
* detection is relevant (meaning we have to detect renames for all * 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 * src/moduleB 2
* *
* which is used to know that xtract.c & token.txt are from the * 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, * src/moduleB directory. Again, following the example above,
* once we need to process src/moduleB, then info->offsets is * once we need to process src/moduleB, then info->offsets is
* updated to * updated to