diff mbox series

[5/5] merge-ort: remove extraneous word in comment

Message ID 456a30ff72a3126439e8253238423b37b772c914.1742108339.git.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit a18c18b470f108c70717ed22c0ab5b892c6d3683
Headers show
Series Miscellaneous fixups preparing for the removal of merge-recursive | expand

Commit Message

Elijah Newren March 16, 2025, 6:58 a.m. UTC 
From: Elijah Newren <newren@gmail.com>

"is was" -> "was"

Signed-off-by: Elijah Newren <newren@gmail.com>
---
 merge-ort.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

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