From: Elijah Newren Date: Sun, 16 Mar 2025 06:58:59 +0000 (+0000) Subject: merge-ort: remove extraneous word in comment X-Git-Tag: v2.50.0-rc0~159^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a18c18b470f108c70717ed22c0ab5b892c6d3683;p=thirdparty%2Fgit.git merge-ort: remove extraneous word in comment "is was" -> "was" Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- diff --git a/merge-ort.c b/merge-ort.c index a12aa213b0..9efc2285a9 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