File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -3423,9 +3423,9 @@ static int collect_renames(struct merge_options *opt,
3423
3423
3424
3424
/*
3425
3425
* 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
3429
3429
* that we have no use for the similarity. So p->score is
3430
3430
* now irrelevant. However, process_renames() will need to
3431
3431
* know which side of the merge this rename was associated
You can’t perform that action at this time.
0 commit comments