[PATCH 5/5] merge-ort: remove extraneous word in comment
From: Elijah Newren via GitGitGadget <hidden>
Date: 2025-03-16 06:59:07
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Elijah Newren <redacted> "is was" -> "was" Signed-off-by: Elijah Newren <redacted> --- merge-ort.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/merge-ort.c b/merge-ort.c
index a12aa213b06..9efc2285a94 100644
--- a/merge-ort.c
+++ b/merge-ort.c@@ -3423,9 +3423,9 @@ static int collect_renames(struct merge_options *opt, /* * p->score comes back from diffcore_rename_extended() with - * the similarity of the renamed file. The similarity is - * was used to determine that the two files were related - * and are a rename, which we have already used, but beyond + * the similarity of the renamed file. The similarity was + * used to determine that the two files were related and + * are a rename, which we have already used, but beyond * that we have no use for the similarity. So p->score is * now irrelevant. However, process_renames() will need to * know which side of the merge this rename was associated
--
gitgitgadget