diff options
| author | Elijah Newren <newren@gmail.com> | 2025-03-16 06:58:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-03-17 15:39:04 -0700 |
| commit | a18c18b470f108c70717ed22c0ab5b892c6d3683 (patch) | |
| tree | 0149a15705ce3d4c6cb823c93047444a477a66b3 | |
| parent | merge-ort: fix accidental strset<->strintmap (diff) | |
| download | git-a18c18b470f108c70717ed22c0ab5b892c6d3683.tar.gz git-a18c18b470f108c70717ed22c0ab5b892c6d3683.zip | |
merge-ort: remove extraneous word in comment
"is was" -> "was"
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | merge-ort.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 |