Skip to content

Commit a18c18b

Browse files
newrengitster
authored andcommitted
merge-ort: remove extraneous word in comment
"is was" -> "was" Signed-off-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5692a46 commit a18c18b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

merge-ort.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3423,9 +3423,9 @@ static int collect_renames(struct merge_options *opt,
34233423

34243424
/*
34253425
* p->score comes back from diffcore_rename_extended() with
3426-
* the similarity of the renamed file. The similarity is
3427-
* was used to determine that the two files were related
3428-
* and are a rename, which we have already used, but beyond
3426+
* the similarity of the renamed file. The similarity was
3427+
* used to determine that the two files were related and
3428+
* are a rename, which we have already used, but beyond
34293429
* that we have no use for the similarity. So p->score is
34303430
* now irrelevant. However, process_renames() will need to
34313431
* know which side of the merge this rename was associated

0 commit comments

Comments
 (0)