diff options
| author | Andrew Kreimer <algonell@gmail.com> | 2024-09-19 18:34:29 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-19 13:46:00 -0700 |
| commit | a966ad1e1b5d3c4788294262ba4bcd67f79176ea (patch) | |
| tree | 33562407da829a81118f31cbdfd395fcc4605e32 | |
| parent | a3621abaf9e5958bb6d9ad1d19af8f430c361b76 (diff) | |
| download | git-a966ad1e1b5d3c4788294262ba4bcd67f79176ea.tar.gz | |
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>
| -rw-r--r-- | merge-ort.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-ort.c b/merge-ort.c index e9d01ac7f7..474ba15c01 100644 --- 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 |